From 39fcb31c8fdb83ffe36d9e92c03db0a1ab6288df Mon Sep 17 00:00:00 2001
From: Andrew Lawson <andrewlawson@Andrews-MacBook-Air-2.local>
Date: Fri, 28 Nov 2014 20:07:33 -0500
Subject: [PATCH 1/4] Changed from ellipses to points (pshape to pvector).

---
 geometric_separators.pde | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/geometric_separators.pde b/geometric_separators.pde
index 2d6507a..4424df9 100644
--- a/geometric_separators.pde
+++ b/geometric_separators.pde
@@ -12,7 +12,7 @@ int calc_h = 25;
 PShape reset;
 PShape calculate;
 // Input list
-ArrayList<PShape> input = new ArrayList<PShape>();
+ArrayList<PVector> input = new ArrayList<PVector>();
 
 // Setup
 void setup() {
@@ -38,16 +38,16 @@ void mousePressed() {
     // Get sorted input points
   }
   else {
-    PShape new_ellipse = createShape(ELLIPSE, mouseX - 12.5, mouseY - 12.5, 25, 25);
-    input.add(new_ellipse);
+    PVector new_point = new PVector(mouseX, mouseY);
+    input.add(new_point);
   }
   redraw();
 }
 
 // Estimate centerpoint
-void approxCenter(ArrayList<PShape> input) {
+void approxCenter(ArrayList<PVector> input) {
   if (input.size() == 1) {
-    return ArrayList.get(0);
+    //return ArrayList.get(0);
   }
   else {
     // Sample points
@@ -57,16 +57,16 @@ void approxCenter(ArrayList<PShape> input) {
 
 // Estimate the geometric median - dynamic programming
 void geomMedian() {
-  // Memoization hash tables
-  HashMap<Double> left = new HashMap<Double>():
-  HashMap<Double> right = new HashMap<Double>():
-  HashMap<Double> up = new HashMap<Double>():
-  HashMap<Double> down = new HashMap<Double>():
-  // Sum of squares values
-  ArrayList<Double> leftSq = new ArrayList<Double>();
-  ArrayList<Double> rightSq = new ArrayList<Double>();
-  ArrayList<Double> upSq = new ArrayList<Double>();
-  ArrayList<Double> downSq = new ArrayList<Double>();
+//  // Memoization hash tables
+//  HashMap<Double> left = new HashMap<Double>();
+//  HashMap<Double> right = new HashMap<Double>();
+//  HashMap<Double> up = new HashMap<Double>();
+//  HashMap<Double> down = new HashMap<Double>();
+//  // Sum of squares values
+//  ArrayList<Double> leftSq = new ArrayList<Double>();
+//  ArrayList<Double> rightSq = new ArrayList<Double>();
+//  ArrayList<Double> upSq = new ArrayList<Double>();
+//  ArrayList<Double> downSq = new ArrayList<Double>();
 }
 
 // Draw
@@ -76,8 +76,8 @@ void draw() {
   shape(calculate);
   text("Reset.", reset_x + 25, reset_y - 10);
   text("Calculate.", calc_x + 25, calc_y - 10);
-  for (PShape ellipse : input) {
-    shape(ellipse);
-    fill(255);
+  for (PVector point : input) {
+    point(point.x, point.y);
+    strokeWeight(4);
   }
 }

From 670e0fc307766768b672be586ba89ce429488b4d Mon Sep 17 00:00:00 2001
From: Andrew Lawson <andrewlawson@Andrews-MacBook-Air-2.local>
Date: Fri, 28 Nov 2014 20:09:14 -0500
Subject: [PATCH 2/4] Fixed stroke weight glitch.

---
 geometric_separators.pde | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/geometric_separators.pde b/geometric_separators.pde
index 4424df9..890d06a 100644
--- a/geometric_separators.pde
+++ b/geometric_separators.pde
@@ -77,7 +77,7 @@ void draw() {
   text("Reset.", reset_x + 25, reset_y - 10);
   text("Calculate.", calc_x + 25, calc_y - 10);
   for (PVector point : input) {
-    point(point.x, point.y);
     strokeWeight(4);
+    point(point.x, point.y);
   }
 }

From 3ac9d9b4f9993f219a1623d7bc27577f6d3cd408 Mon Sep 17 00:00:00 2001
From: Andrew Lawson <andrewlawson@Andrews-MacBook-Air-2.local>
Date: Fri, 28 Nov 2014 20:12:13 -0500
Subject: [PATCH 3/4] Removed centerpoint code already defined in master.

---
 geometric_separators.pde | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/geometric_separators.pde b/geometric_separators.pde
index 890d06a..03c5cd8 100644
--- a/geometric_separators.pde
+++ b/geometric_separators.pde
@@ -44,31 +44,6 @@ void mousePressed() {
   redraw();
 }
 
-// Estimate centerpoint
-void approxCenter(ArrayList<PVector> input) {
-  if (input.size() == 1) {
-    //return ArrayList.get(0);
-  }
-  else {
-    // Sample points
-    
-  }
-}
-
-// Estimate the geometric median - dynamic programming
-void geomMedian() {
-//  // Memoization hash tables
-//  HashMap<Double> left = new HashMap<Double>();
-//  HashMap<Double> right = new HashMap<Double>();
-//  HashMap<Double> up = new HashMap<Double>();
-//  HashMap<Double> down = new HashMap<Double>();
-//  // Sum of squares values
-//  ArrayList<Double> leftSq = new ArrayList<Double>();
-//  ArrayList<Double> rightSq = new ArrayList<Double>();
-//  ArrayList<Double> upSq = new ArrayList<Double>();
-//  ArrayList<Double> downSq = new ArrayList<Double>();
-}
-
 // Draw
 void draw() {
   background(255);

From ee4cce2fc02dea71250d574f8ada7b9b8126b63e Mon Sep 17 00:00:00 2001
From: Andrew Lawson <andrewlawson@Andrews-MacBook-Air-2.local>
Date: Fri, 28 Nov 2014 20:17:47 -0500
Subject: [PATCH 4/4] Added back missing code.

---
 geometric_separators.pde | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/geometric_separators.pde b/geometric_separators.pde
index 03c5cd8..f7e227d 100644
--- a/geometric_separators.pde
+++ b/geometric_separators.pde
@@ -44,6 +44,31 @@ void mousePressed() {
   redraw();
 }
 
+// Estimate centerpoint
+void approxCenter(ArrayList<PShape> input) {
+  if (input.size() == 1) {
+    // Do nothing
+  }
+  else {
+    // Sample points
+    
+  }
+}
+
+// Estimate the geometric median - dynamic programming
+void geomMedian() {
+  // Memoization hash tables
+  HashMap<String, Double> left = new HashMap<String, Double>();
+  HashMap<String, Double> right = new HashMap<String, Double>();
+  HashMap<String, Double> up = new HashMap<String, Double>();
+  HashMap<String, Double> down = new HashMap<String, Double>();
+  // Sum of squares values
+  ArrayList<Double> leftSq = new ArrayList<Double>();
+  ArrayList<Double> rightSq = new ArrayList<Double>();
+  ArrayList<Double> upSq = new ArrayList<Double>();
+  ArrayList<Double> downSq = new ArrayList<Double>();
+}
+
 // Draw
 void draw() {
   background(255);