From e3ee4e88786747dc7060a3cb26841bff5d4f9666 Mon Sep 17 00:00:00 2001
From: davpapp <david.papp@students.olin.edu>
Date: Fri, 23 Feb 2018 09:26:15 -0500
Subject: [PATCH] Refactored object detection, added new classifier class
 (ores)

---
 src/Cursor.java                               |   6 ++
 src/DetectedObject.java                       |  49 ++++++++++
 src/ImageCollector.java                       |  13 +--
 src/IronMiner.java                            |  75 +++++++++------
 src/ObjectDetector.java                       |  88 ++++++++++--------
 src/Paths.java                                |   2 +
 src/cascadeTrainingImageCollector.java        |  17 ++--
 target/classes/Cursor.class                   | Bin 8326 -> 8498 bytes
 target/classes/DetectedObject.class           | Bin 0 -> 2134 bytes
 target/classes/ImageCollector$1.class         | Bin 843 -> 843 bytes
 target/classes/ImageCollector.class           | Bin 3800 -> 3837 bytes
 target/classes/IronMiner.class                | Bin 4326 -> 4200 bytes
 target/classes/ObjectDetector.class           | Bin 5241 -> 6233 bytes
 target/classes/Paths.class                    | Bin 821 -> 1013 bytes
 .../cascadeTrainingImageCollector.class       | Bin 4133 -> 3328 bytes
 15 files changed, 165 insertions(+), 85 deletions(-)
 create mode 100644 src/DetectedObject.java
 create mode 100644 target/classes/DetectedObject.class

diff --git a/src/Cursor.java b/src/Cursor.java
index 3a3fd17..f9f9b44 100644
--- a/src/Cursor.java
+++ b/src/Cursor.java
@@ -125,6 +125,12 @@ public class Cursor {
 		return randomizedGoalPoint; // Return the point we moved to in case we need precise movement afterwards
 	}
 
+	public Point moveCursorToCoordinatesWithRandomness(Point goalPoint, int xTolerance, int yTolerance) throws Exception {
+		Point randomizedGoalPoint = randomizePoint(goalPoint, xTolerance, yTolerance);
+		moveCursorToCoordinates(randomizedGoalPoint);
+		return randomizedGoalPoint; // Return the point we moved to in case we need precise movement afterwards
+	}
+	
 	public void moveCursorToCoordinates(Point goalPoint) throws Exception {
 		Point startingPoint = getCurrentCursorPoint();
 		int distanceToMoveCursor = getDistanceBetweenPoints(startingPoint, goalPoint);
diff --git a/src/DetectedObject.java b/src/DetectedObject.java
new file mode 100644
index 0000000..a3eb6b3
--- /dev/null
+++ b/src/DetectedObject.java
@@ -0,0 +1,49 @@
+import java.awt.Point;
+import java.awt.Rectangle;
+
+
+
+public class DetectedObject {
+	
+	private Rectangle boundingBox;
+	private float detectionScore;
+	private String detectionClass;
+	
+	public DetectedObject(float detectionScore, float detectionClass, float[] detectionBox) {
+		this.boundingBox = initializeBoundingBox(detectionBox);
+		this.detectionScore = detectionScore;
+		this.detectionClass = initializeLabel(detectionClass);
+	}
+	
+	private Rectangle initializeBoundingBox(float[] detectionBox) {
+		int offset_x = (int) (detectionBox[1] * Constants.GAME_WINDOW_WIDTH);
+		int offset_y = (int) (detectionBox[0] * Constants.GAME_WINDOW_HEIGHT);
+		int width = (int) (detectionBox[3] * Constants.GAME_WINDOW_WIDTH) - offset_x;
+		int height = (int) (detectionBox[2] * Constants.GAME_WINDOW_HEIGHT) - offset_y;
+		
+		//System.out.println(detectionBox[0] + ", " + detectionBox[1] + ", " + detectionBox[2] + ", " + detectionBox[3]);
+		return new Rectangle(offset_x, offset_y, width, height);
+	}
+	
+	private String initializeLabel(float detectionClass) {
+		// TODO: actually load these from a file
+		String[] labels = {"NA", "ironOre", "ore"};
+		return labels[(int) detectionClass];
+	}
+	
+	public String getDetectionClass() {
+		return detectionClass;
+	}
+	
+	public Rectangle getBoundingBox() {
+		return boundingBox;
+	}
+	
+	public Point getCenterForClicking() {
+		return new Point(boundingBox.x + boundingBox.width / 2 + Constants.GAME_WINDOW_OFFSET_X, boundingBox.y + boundingBox.height / 2 + Constants.GAME_WINDOW_OFFSET_Y);
+	}
+	
+	public void display() {
+		System.out.println(detectionClass + " with score " + detectionScore + " at (" + getCenterForClicking().x + "," + getCenterForClicking().y + ")");
+	}
+}
diff --git a/src/ImageCollector.java b/src/ImageCollector.java
index 037b648..9339eec 100644
--- a/src/ImageCollector.java
+++ b/src/ImageCollector.java
@@ -12,6 +12,7 @@ public class ImageCollector {
 
 	public String screenshotOutputDirectory;
 	public Rectangle gameWindowRectangle;
+	public Robot robot;
 	
 	/*
 	 * Methods needed:
@@ -23,13 +24,14 @@ public class ImageCollector {
 	 * detect last file name
 	 */
 	
-	public ImageCollector(String screenshotOutputDirectory) {
+	public ImageCollector(String screenshotOutputDirectory) throws AWTException {
 		initializeGameWindowRectangle();
 		this.screenshotOutputDirectory = screenshotOutputDirectory;
+		this.robot = new Robot();
 	}
 	
 	private void initializeGameWindowRectangle() {
-		this.gameWindowRectangle = new Rectangle(103, 85, 510, 330);
+		this.gameWindowRectangle = new Rectangle(Constants.GAME_WINDOW_OFFSET_X, Constants.GAME_WINDOW_OFFSET_Y, Constants.GAME_WINDOW_WIDTH, Constants.GAME_WINDOW_HEIGHT);
 	}
 	
 	public void collectImages(String itemName) throws IOException, InterruptedException, AWTException {
@@ -66,7 +68,6 @@ public class ImageCollector {
 	}
 	
 	private void captureAndSaveGameWindow(String itemName, int fileCounter) throws IOException, InterruptedException, AWTException {
-		Robot robot = new Robot();
 		BufferedImage imageCaptured = robot.createScreenCapture(gameWindowRectangle);
 		String fileName = getFileName(itemName, fileCounter);
 		ImageIO.write(imageCaptured, "jpg", new File(fileName));
@@ -85,8 +86,8 @@ public class ImageCollector {
 	
 	public static void main(String[] args) throws Exception
     {
-        ImageCollector imageCollector = new ImageCollector("/home/dpapp/Desktop/RunescapeAI/TensorFlow/IronOre/");
-        //imageCollector.collectImages("ironOre");
-        imageCollector.generateInventoryImages();
+        ImageCollector imageCollector = new ImageCollector("/home/dpapp/Desktop/RunescapeAI/TensorFlow/Ores/Images/");
+        imageCollector.collectImages("ore");
+        //imageCollector.generateInventoryImages();
     }
 }
diff --git a/src/IronMiner.java b/src/IronMiner.java
index 3054cef..13eaf54 100644
--- a/src/IronMiner.java
+++ b/src/IronMiner.java
@@ -9,11 +9,13 @@ import java.util.ArrayList;
 
 import javax.imageio.ImageIO;
 
+import org.opencv.core.Rect2d;
+
 public class IronMiner {
 	
 	public static final int IRON_ORE_MINING_TIME_MILLISECONDS = 2738;
 	public static final int MAXIMUM_DISTANCE_TO_WALK_TO_IRON_ORE = 400;
-	public static final Point GAME_WINDOW_CENTER = new Point(510 / 2, 330 / 2);
+	public static final Point GAME_WINDOW_CENTER = new Point(Constants.GAME_WINDOW_WIDTH / 2, Constants.GAME_WINDOW_HEIGHT / 2);
 	
 	Cursor cursor; 
 	CursorTask cursorTask;
@@ -35,13 +37,15 @@ public class IronMiner {
 	public void run() throws Exception {
 		
 		while (true) {
-			//Thread.sleep(250);
-			
-			String filename = "/home/dpapp/Desktop/RunescapeAI/temp/screenshot.jpg";
-			BufferedImage image = captureScreenshotGameWindow();
-			ImageIO.write(image, "jpg", new File(filename));
-			mineClosestIronOre(filename);
+			objectDetector.update();
+			ArrayList<DetectedObject> ironOres = objectDetector.getRecognizedObjectsOfClassFromImage("ironOre");
+			ArrayList<DetectedObject> ores = objectDetector.getRecognizedObjectsOfClassFromImage("ore");
+			System.out.println(ironOres.size() + " ironOres, " + ores.size() + " ores.");
 			
+			/*for (DetectedObject ironOre : ironOres) {
+				ironOre.display();
+			}*/
+			mineClosestIronOre(ironOres, ores);
 			dropInventoryIfFull();
 		}
 	}
@@ -53,47 +57,56 @@ public class IronMiner {
 		}
 	}
 	
-	private void mineClosestIronOre(String filename) throws Exception {
+	
+	private void mineClosestIronOre(ArrayList<DetectedObject> ironOres, ArrayList<DetectedObject> ores) throws Exception {
+		DetectedObject closestIronOre = getClosestObjectToCharacter(ironOres);
+		if (closestIronOre != null) {
+			cursor.moveAndLeftClickAtCoordinatesWithRandomness(closestIronOre.getCenterForClicking(), 10, 10);
+			Thread.sleep(84, 219);
+			DetectedObject closestOre = getClosestObjectToCharacter(ores);
+			if (closestOre != null) {
+				cursor.moveCursorToCoordinatesWithRandomness(closestOre.getCenterForClicking(), 10, 10);
+			}
+			Thread.sleep(randomizer.nextGaussianWithinRange(IRON_ORE_MINING_TIME_MILLISECONDS - 250, IRON_ORE_MINING_TIME_MILLISECONDS + -50));
+		}
+			//Thread.sleep(randomizer.nextGaussianWithinRange(150, 350));
+
+		//cursor.moveCursorToCoordinates(goalPoint);
+	}
+	/*private void mineClosestIronOre(String filename) throws Exception {
 		Point ironOreLocation = getClosestIronOre(filename);
-		/*if (ironOreLocation == null) {
-			Thread.sleep(1000);
-		}*/
 		if (ironOreLocation != null) {
 			System.out.println("Mineable iron at (" + (ironOreLocation.x + 103) + "," + (ironOreLocation.y + 85) + ")");
 			Point actualIronOreLocation = new Point(ironOreLocation.x + 103, ironOreLocation.y + 85);
+			Rect2d trackerBoundingBox = new Rec2d();
+			//Rectangle trackerBoundingBox = new Rectangle(ironOreLocation.x - 10, ironOreLocation.x + 10, ironOreLocation.y - 10, ironOreLocation.y + 10);
+			//tracker.init(image, trackerBoundingBox);
 			cursor.moveAndLeftClickAtCoordinatesWithRandomness(actualIronOreLocation, 12, 12);
 			Thread.sleep(randomizer.nextGaussianWithinRange(IRON_ORE_MINING_TIME_MILLISECONDS - 350, IRON_ORE_MINING_TIME_MILLISECONDS + 150));
 		}
 		
 	}
 	
-	private Point getClosestIronOre(String filename) throws IOException {
-		ArrayList<Point> ironOreLocations = objectDetector.getIronOreLocationsFromImage(filename);
-		System.out.println(ironOreLocations.size());
-		int closestDistanceToIronOreFromCharacter = Integer.MAX_VALUE;
-		Point closestIronOreToCharacter = null;
-		for (Point ironOreLocation : ironOreLocations) {
-			int distanceToIronOreFromCharacter = getDistanceBetweenPoints(GAME_WINDOW_CENTER, ironOreLocation);
-			if (distanceToIronOreFromCharacter < closestDistanceToIronOreFromCharacter) {
-				closestDistanceToIronOreFromCharacter = distanceToIronOreFromCharacter;
-				closestIronOreToCharacter = new Point(ironOreLocation.x, ironOreLocation.y);
+	}*/
+	
+	private DetectedObject getClosestObjectToCharacter(ArrayList<DetectedObject> detectedObjects) {
+		int closestDistanceToCharacter = Integer.MAX_VALUE;
+		DetectedObject closestObjectToCharacter = null;
+		
+		for (DetectedObject detectedObject : detectedObjects) {
+			int objectDistanceToCharacter = getDistanceBetweenPoints(GAME_WINDOW_CENTER, detectedObject.getCenterForClicking());
+			if (objectDistanceToCharacter < closestDistanceToCharacter) {
+				closestDistanceToCharacter = objectDistanceToCharacter;
+				closestObjectToCharacter = detectedObject;
 			}
 		}
-		
-		if (closestIronOreToCharacter != null && closestDistanceToIronOreFromCharacter < MAXIMUM_DISTANCE_TO_WALK_TO_IRON_ORE) {
-			return closestIronOreToCharacter;
+		if (closestObjectToCharacter != null && closestDistanceToCharacter < MAXIMUM_DISTANCE_TO_WALK_TO_IRON_ORE) {
+			return closestObjectToCharacter;
 		}
 		return null;
 	}
 	
-	
 	public int getDistanceBetweenPoints(Point startingPoint, Point goalPoint) {
 		return (int) (Math.hypot(goalPoint.x - startingPoint.x, goalPoint.y - startingPoint.y));
 	}
-	
-	private BufferedImage captureScreenshotGameWindow() throws IOException {
-		Rectangle area = new Rectangle(103, 85, 510, 330);
-		return robot.createScreenCapture(area);
-		
-	}
 }
diff --git a/src/ObjectDetector.java b/src/ObjectDetector.java
index 95d0240..b2ab4bc 100644
--- a/src/ObjectDetector.java
+++ b/src/ObjectDetector.java
@@ -13,7 +13,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
+import java.awt.AWTException;
 import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.Robot;
 import java.awt.image.BufferedImage;
 import java.awt.image.DataBufferByte;
 import java.io.File;
@@ -24,6 +27,7 @@ import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import javax.imageio.ImageIO;
@@ -38,16 +42,28 @@ import org.tensorflow.types.UInt8;
 public class ObjectDetector {
   
 	SavedModelBundle model;
+	ArrayList<DetectedObject> detectedObjects;
+	Robot robot;
 	
-	public ObjectDetector() {
-		model = SavedModelBundle.load("/home/dpapp/tensorflow-1.5.0/models/raccoon_dataset/results/checkpoint_23826/saved_model/", "serve");
+	public ObjectDetector() throws AWTException {
+		this.model = SavedModelBundle.load("/home/dpapp/tensorflow-1.5.0/models/raccoon_dataset/results/checkpoint_22948/saved_model/", "serve");
+		this.detectedObjects = new ArrayList<DetectedObject>();
+		this.robot = new Robot();
 	}
 	
-	public ArrayList<Point> getIronOreLocationsFromImage(String filename) throws IOException {
+	public void update() throws Exception {
+		// TODO: eliminate IO and pass BufferedImage directly.
+		String fileName = "/home/dpapp/Desktop/RunescapeAI/temp/screenshot.jpg";
+		BufferedImage image = captureScreenshotGameWindow();
+		ImageIO.write(image, "jpg", new File(fileName));
+		this.detectedObjects = getRecognizedObjectsFromImage(fileName);
+	}
+	
+	private ArrayList<DetectedObject> getRecognizedObjectsFromImage(String fileName) throws Exception {
 		List<Tensor<?>> outputs = null;
-        ArrayList<Point> ironOreLocations = new ArrayList<Point>();
-        
-        try (Tensor<UInt8> input = makeImageTensor(filename)) {
+		ArrayList<DetectedObject> detectedObjectsInImage = new ArrayList<DetectedObject>();
+		
+        try (Tensor<UInt8> input = makeImageTensor(fileName)) {
           outputs =
               model
                   .session()
@@ -62,47 +78,30 @@ public class ObjectDetector {
         try (Tensor<Float> scoresT = outputs.get(0).expect(Float.class);
         	Tensor<Float> classesT = outputs.get(1).expect(Float.class);
             Tensor<Float> boxesT = outputs.get(2).expect(Float.class)) {
-              // All these tensors have:
-              // - 1 as the first dimension
-              // - maxObjects as the second dimension
-              // While boxesT will have 4 as the third dimension (2 sets of (x, y) coordinates).
-              // This can be verified by looking at scoresT.shape() etc.
+           
             int maxObjects = (int) scoresT.shape()[1];
             float[] scores = scoresT.copyTo(new float[1][maxObjects])[0];
             float[] classes = classesT.copyTo(new float[1][maxObjects])[0];
             float[][] boxes = boxesT.copyTo(new float[1][maxObjects][4])[0];
-              // Print all objects whose score is at least 0.5.
-            boolean foundSomething = false;
+
             for (int i = 0; i < scores.length; ++i) {
-              if (scores[i] < 0.75) {
-                continue;
+              if (scores[i] > 0.80) {
+            	  detectedObjectsInImage.add(new DetectedObject(scores[i], classes[i], boxes[i]));
               }
-              foundSomething = true;
-              //System.out.printf("\tFound %-20s (score: %.4f)\n", "ironOre", scores[i]);
-              //System.out.println("X:" + 510 * boxes[i][1] + ", Y:" + 330 * boxes[i][0] + ", width:" + 510 * boxes[i][3] + ", height:" + 330 * boxes[i][2]);
-              ironOreLocations.add(getCenterPointFromBox(boxes[i]));
-            }
-            if (!foundSomething) {
-              System.out.println("No objects detected with a high enough score.");
             }
           }
-        return ironOreLocations;
+        return detectedObjectsInImage;
 	}
     
-	private Point getCenterPointFromBox(float[] box) {
-		int x = (int) (510 * (box[1] + box[3]) / 2);
-		int y = (int) (330 * (box[0] + box[2]) / 2);
-		return new Point(x, y);
+	public ArrayList<DetectedObject> getRecognizedObjectsOfClassFromImage(String objectClass) {
+		ArrayList<DetectedObject> detectedObjectsOfType = new ArrayList<DetectedObject>();
+		for (DetectedObject detectedObject : this.detectedObjects) {
+			if (detectedObject.getDetectionClass().equals(objectClass)) {
+				detectedObjectsOfType.add(detectedObject);
+			}
+		}
+		return detectedObjectsOfType;
 	}
-    
-
-  private static void bgr2rgb(byte[] data) {
-    for (int i = 0; i < data.length; i += 3) {
-      byte tmp = data[i];
-      data[i] = data[i + 2];
-      data[i + 2] = tmp;
-    }
-  }
 
   private static Tensor<UInt8> makeImageTensor(String filename) throws IOException {
     BufferedImage img = ImageIO.read(new File(filename));
@@ -111,8 +110,6 @@ public class ObjectDetector {
           String.format(
               "Expected 3-byte BGR encoding in BufferedImage, found %d (file: %s). This code could be made more robust"));
     }
-	//System.out.println("Image is of type RGB? " + (img.getType() == BufferedImage.TYPE_INT_RGB));
-	//System.out.println("Image is of type RGB? " + (img.getType() == BufferedImage.TYPE_3BYTE_BGR));
     byte[] data = ((DataBufferByte) img.getData().getDataBuffer()).getData();
 
     // ImageIO.read seems to produce BGR-encoded images, but the model expects RGB.
@@ -122,4 +119,17 @@ public class ObjectDetector {
     long[] shape = new long[] {BATCH_SIZE, img.getHeight(), img.getWidth(), CHANNELS};
     return Tensor.create(UInt8.class, shape, ByteBuffer.wrap(data));
   }
-}
+  
+  private static void bgr2rgb(byte[] data) {
+    for (int i = 0; i < data.length; i += 3) {
+      byte tmp = data[i];
+      data[i] = data[i + 2];
+      data[i + 2] = tmp;
+    }
+  }
+  
+  private BufferedImage captureScreenshotGameWindow() throws IOException {
+	Rectangle area = new Rectangle(103, 85, 510, 330);
+	return robot.createScreenCapture(area);
+  }
+}
\ No newline at end of file
diff --git a/src/Paths.java b/src/Paths.java
index 9eb84fe..9c864d7 100644
--- a/src/Paths.java
+++ b/src/Paths.java
@@ -7,4 +7,6 @@ public class Paths {
 	public static final String CURSOR_COORDINATES_FILE_PATH = "/home/dpapp/GhostMouse/coordinates.txt";
 	
 	public static final String TENSORFLOW_MODEL_DIRECTORY = "/home/dpapp/tensorflow-1.5.0/models/raccoon_dataset/results/checkpoint_23826/saved_model/";
+	public static final String TENSORFLOW_TRAINING_IMAGE_OUTPUT_DIRECTORY = "/home/dpapp/tensorflow-1.5.0/models/raccoon_dataset/results/checkpoint_23826/saved_model/";
+	public static final String TENSORFLOW_MODEL_LABELS_FILE_PATH = "/home/dpapp/tensorflow-1.5.0/models/raccoon_dataset/training/labels.pbtxt";
 }
diff --git a/src/cascadeTrainingImageCollector.java b/src/cascadeTrainingImageCollector.java
index 11507cb..24f7bad 100644
--- a/src/cascadeTrainingImageCollector.java
+++ b/src/cascadeTrainingImageCollector.java
@@ -33,9 +33,8 @@ public class cascadeTrainingImageCollector {
 	public void captureWindowEveryNMilliseconds(int n) throws InterruptedException, IOException {
 		for (int i = 0; i < 1000; i++) {
 			captureScreenshotGameWindow(i);
-			System.out.println(i);
-			//System.out.println("Created image: " + getImageName(i));
-            Thread.sleep(n * 1000);
+			System.out.println("Created image: " + getImageName(i));
+            Thread.sleep(n);
 		}
 	}
 	
@@ -63,7 +62,7 @@ public class cascadeTrainingImageCollector {
 		return imageOutputDirectory + "screenshot" + counter + ".jpg";
 	}
 	
-	private void resizeImagesInDirectory() throws IOException {
+	/*private void resizeImagesInDirectory() throws IOException {
 		File folder = new File("/home/dpapp/Desktop/RunescapeAIPics/CascadeTraining/Testing/");
 		File[] listOfFiles = folder.listFiles();
 
@@ -73,21 +72,21 @@ public class cascadeTrainingImageCollector {
 				System.out.println("Cropped " + listOfFiles[i].getName());
 		    }
 		}
-	}
+	}*/
 	
-	private void resizeImage(File imageFile, int counter) throws IOException {
+	/*private void resizeImage(File imageFile, int counter) throws IOException {
 		BufferedImage screenshot = ImageIO.read(imageFile);
 		//Rectangle resizeRectangle = new Rectangle(103, 85, 510, 330);
 		BufferedImage resizedImage = screenshot.getSubimage(103, 85, 510, 330);
 		ImageIO.write(resizedImage, "jpg", new File(getImageName(counter)));
-	}
+	}*/
 	
 	public static void main(String[] args) throws Exception
     {
 		System.out.println("Starting image collection...");
-        cascadeTrainingImageCollector imageCollector = new cascadeTrainingImageCollector("/home/dpapp/Desktop/RunescapeAIPics/CascadeTraining/CoalNegative/");
+        cascadeTrainingImageCollector imageCollector = new cascadeTrainingImageCollector(Paths.TENSORFLOW_TRAINING_IMAGE_OUTPUT_DIRECTORY);
         //imageCollector.resizeImagesInDirectory();
-		imageCollector.captureWindowEveryNMilliseconds(5);;
+		imageCollector.captureWindowEveryNMilliseconds(2000);
 		//cascadeTrainingImageCollector imageCollector = new cascadeTrainingImageCollector("/home/dpapp/Desktop/RunescapeAIPics/CascadeTraining/Testing/");
 		//imageCollector.captureWindowEveryNMilliseconds(1);
     }
diff --git a/target/classes/Cursor.class b/target/classes/Cursor.class
index 5323db5cd621f64518ec31b730ac8e9bc585a4d0..b7c03b73aa24c060e2c8ff37db5ee5b571b265e2 100644
GIT binary patch
delta 2042
zcmZ`)YfzMB6n@U~?YGPFv4AV?e(VKIL0N7JUVvCsKn)c#MbXM+i&dy(4Hhr;gUTjs
zx>&x=Fq1#TYQ`p+6lE5?WL7_FbTsXvX{D7`T1JtYSqYu*TSTX+ANzjq<vi~>=Q+=L
z_vvXnODqTb_v{BSkrs7YmRfQNsVjo30;SE3O~J;hU}-SeSX<xV4+Wa4>qB+({0+6i
z6%B!=CJPA16nu<NM3ZH_{F#E|I3eD&OqWk8IE6376-$Zym4eeaBYZJa<!=;xi?d=~
zOrHFmg75Kz*cY?E<rjkWLH{a$j(>G1XKt{*Ary^X^eOlaGJ)1;tIG<m=&Q9BT*WmL
z{<r~p*x#@`r@|kqQ}8GLA{gt|t_+6wJGQJWy-c&duApB(@rV2kxfV1N6e27q*p>%E
zrQ({BP#HytiKH6|fDGu1=Haphy<}2gC$n~Cd3pLmPMRzV#b5`A&=|Zw7^(<1Hw7w~
zFh)?ULRPUT_HKE&LWyJ+J+W!BLm`!t#JSk443|P~v=XGI`bPs66j8E5DU?JoH3Zg#
z${Rx3^|vWBibjhf>qt3Gp)pL^1J>s$NAy`!%~vT`p*+6L6X%mBQ-O){g+I<7RY<ps
z$KtYOA5Ae)vDhA`Mos0q9EwY&QqdRZa!)5%s_FubffPUgEL4J89_S8*%4wGH#(Uj!
z2yrPZnaZY=;Ib4gK+TLQHH$mNBk{TB61q#Fc{E>aiyuu3#L@T-<la@2u);(ii9L3&
zYnLkRU>zASjYlh@czgoUcoK0~x6$DfhaD;R9j)+YW`yx+vHtnIKytqVsnhH3#+QY%
zDm$bwzAiL*Ra0g+&UNw)QTlCZd=JnHBi2K~GZ>C%;lOiHu>mP~5$O;ZhnK}{b!5wV
z?B*C0q~Zc(#t(-ZKjJ4yY?*+ISjW5RFym*QnXr`aW!C$lnz-0etZ7y;k1pP?W{j4F
zn%RY4Gx%5A%Ck#6yHwlSgWq51;KN9|GDCnil%NIdM@OL)WxUCFXfbI9Dth$jNNbQm
zFAE2~IR4wq-`g2?tCLOa<c1H&kPpWVA66zN;>4gg*_tGG!9W-f6-rw%S(SDpNH{=-
z%Dw1aoYh5==Cy_=MlH3PZjuX)Uey?;Xx>xAkt9#zX4uh=Tx>x;Ud2>w#w@%p$Z0R*
z!s=<w)}0&JE}h~jfz!{0m4<PuMx9_g3<F#dqX}d}GZW3kuLSZ~?J?qBr`n>idnrsd
zt>TefE&K(xvUc9k^BtkD<A?H%rx7}*2JL;}GnK6+4yIGD+;I-U#5=`aXPE3hZx<H1
z!dQO*3o5gCF(oTZeBjZynhT{Cm$Mx*%h&62cGJiLqbfO=f>ce;k}g1xe%&^fP6vkJ
zEu>*PGOz>L*o8^x(nBofQ+7ENVzDkj;@x~2%cFsjnUv0gjAFclyv&}&XfrL#V0{`f
zpWzDU5HYJ_Gfkbm(~oQ>ZUJ-0jPYag?|f+q+Zx%n%|@9%8)X$cCvmwwTHcA=Qd;7i
zu{h~U<#E7eZ^>*&qMHrdVcm<)#Wu?Brg87M7~T$}yCZUBbagmgwLLW6>DI>AU~+AR
z<knOlY0FC3c;3TV?B<5r!%e@J#lH`u@HS_-huJxR33wMX@E*$XKIZVc8Xq7~f)7~$
z2eBH5uoj2$IF9f;aqJcv+lFXt8>CT!pb0vSW^AB|;)L55r9G5(&lox`rg-c{8p&Fh
znRSGL=ltiyqt?sg`Kz6odT3IZif%qs5y&aA(UX_oyIAXTRdR(|U9DlfRHMmKmE56L
zx4z`=xCx9X^fbRrXT){SJ%xi{BZDK>I@p*fg<2D(|AU`p_&KpLc_vL0r;=SuO1Knd
z-84h1oO7sfVVY^9*<q?+(asFh+%U#GMdVB{Z`v|&XeW|wRK;62pUV-t7|!!}ft&0+
Ud@QdSxG3hQWSSN-2?nbE2YPI}ga7~l

delta 2024
zcmZ`)Yfw~W7=GU6>^aMFTrSHBhuwumMdYsF1xZLQqNtE5O4>}a4J+D(bzo8P50)BM
zqmJ`UV`}4QPLZW0N()Mv-KHjI%G63L4KLlJOiS&Cz2_{VKkCQ%&Ue1=c`x7dKJRz-
zmpoQ%{h<HQVF2T(ro+0>YPEuJOvT4IF1A_6$R|~Nf=|V9>lFEviqrU9xFbsBFIAku
zS>cPAEcdE7hx6j4h&=hCim&mFxEOJ`^=E?Z0q-(zj(2$=XO@3SLm(V|xTNA&$OKxU
ze_c`WoAK3R#Z_EaaP6kiL*9n^oJwzCv5G(NC&9e9WvM^F?@?uCX=OV4Zx#O-JKlh|
zA=ip#+)xRqC)n$KfzpM|jZOZ>S?s}x-K3C-5K$UhHL@YXrEnguSkXtaia1hq{}mN!
z^Oyk&SILTfoKK_wet)3S-`wP@^e^+V1*s|x5vztQknJkPk|KJCjFjV4iYHB|wyX@N
zN-ne!q^2b+eO64OM3s_ABPb2N6@iL|fbKq7rC~H&)Y+2d6qQCYe^1)hQ?}3|Q!H0$
zj7quetvs^OGoJDlnm~vdB-6;HqG6F=rHND^c130nn?ywl6%t|xLB^?ljUm{bT*@nv
zDN+d`PIN@YC0VG9V69&4YxH@%{8*_Nbv)2im8MaJm>rewnL&v3EM)?lJpM%<{VY0+
zDs@B^AxoT-5=4EJ-Kww7Qt57*Elxy@plWeFY9qN0tc!kF5iOeMzK<%?Gc$rXQDnS6
zn<%-rLh49&cj1cyS(D?XAigS4(lsTs3l}<Ah+!z^aU{Zdd<14Z3Kgpni?xWyW6<z8
zJa__WSdY=zAg*c2t>5AxOpHpwcaYgW7H)ixA0RO@8b7kN%y<ia;+cYl?3ZiM4^83H
zhq2sQ;5@o`y@qYV_^oAj;+G75>e_gAnP->l+Pd-khCRG#G7^;81lWWUw1VRpRwzXo
zFS0%KoOFPOZX-L=duJfZyn!h3{~hJ8SJ>|MAWw0Sn=#@CW5nN#QOCrDf|&IFV^fXc
z5(nF69O^?RQRbByT!#K29xRaBF+r0K!cRCtRMmsN`B|M5re{;j6G=aEZ5Npf%;}mr
zNETj;5G$RDjxC78R^+nZd_056*n;WUF7`U(T5U|Ne%u*GQYOZwQ6xn%ExE8!G*e(U
zh>wHm23N|gfD|-y0k|MbfjsUB?zaJcrm>lcokgX0Vw_$Do&O-k=;{dZVm0=6A`;IU
z+=x<FOoYRr++^HLwXQ@ODq3BRnF&F12eIx5nhPYCa|dKi+L!Kfc9CbIS(D=Vd?WU;
zU&$zHBBuj9$8<f97`(tL+>H#ph-~b|c)TonU2!$K#)zMMO6AeSxJ(+wnhRreJf$%a
z5@Rit&I&YR4*OFXA3{|#O4lE+^dp-on9D5i+4ak#%Iz{|6xu0M_}val5Nq8jtqI!^
z?vRSwVOt}SLyER++j*ncWv7fCaJU(|1GXM?%(qik7v;PW+AzEKgtpACJx*6$H;s0>
z^>G&zS34xPF5ys*Rl&~l{haRs?v75_@G2`gh~ensvveYR0S;j-dQgtnP=VJmlfP^5
zCVY5{tM(3-<6X4iJ*>j}+@?p3QWP;Mz~(`jZZ?{d??VX6GYGR_BaIcS6AQ!iJMitq
z)aqlm3EVPhX)y@aRb?@Jn3zWXEe(id48Qd~rJKeD=?=YyxA)9RQIwRI-#1^Ek0!YS
zZLYQ;Hr47%(j<4F&24<L$Zr{jM0JWUp3`D?(!B)(#%4ASp$%iRLkhGxr2jKN!{%p2
zk!Nb_WNypQt@1P<Uf1)~uu1J0yB|qCRLnIi?V>5H@OzwwJm&_9rCM&M=|P(5<XMpJ
y3L<q4k<%#qQMR+w9A3J0Ne*R!0q1$Vz%6thh1~z;d;{p$g^-d{mAN`AH1A(RFtZ&1

diff --git a/target/classes/DetectedObject.class b/target/classes/DetectedObject.class
new file mode 100644
index 0000000000000000000000000000000000000000..3fffeed813edfc4ba59c4c87138c40b3a5a9b5a7
GIT binary patch
literal 2134
zcmZuxYgZdp6y1|IVG3zTpeVFaDujeIv{HOPQ68qEDPYr5Q`9m^hA?!P!DPatKI(V=
zgkSuwE(k7J`UCt?>b^4}2@hC{d(YvVefHVs-1+C<KmP`BA3yowlF+rFT58c!OUs2V
zo_=^FgtnAjC9Nw)Iqi5QbQa8-QPPa^oVhO{lC>k0JuCf~NetB0DPomuEX_1>MYEzx
zkTUJgd0nYiC4`-18$M@Mh{;snv}S15j0Ar?lUd7*u1fICn<X^}H@anXA|$~bA6*TC
z05W<Ikq{Lrnxbp3)VX$cH{t}iieU$ndu4dx6So^O{0IoZH)Ont0SVnLz^qbGb(V;q
zA+^&L**9f$Ajq7oW~fWG?Sfi)q7-yC9nP9XMPF4any?#AkF}|>_fYn{-0WO#ie^je
zTFZFm{{y@K1>_ee-es+W7(qg)k`#h1@<#|3FgG@;s`Y{ck``O$fducKR<bs!@}{bl
zH#y{c=Z5S|A%F=9uBF)kCW)$5Ok=sC2Jk+Gw}<J|g(hsGXYHy9UN5Vb(;VmD7<DAx
zm_xgITnUDrn^^Bz+{KNGFmhfsEVYs`EAzTme93j8B<=Alre;`Ee#{ZLDV6Q)piB!g
zK0%6#><jCmj5Jc>wkYE>+kYUetc-D_f|$jUkad}oQC1<Uzob=nbcIom@x+hZdEpMK
zmbxwDDH!QCYZf=g(MB`VD_m`h(yGcf*?lRYul1}P#pi08UQ#PT+{JSlYxs)gb``y*
zE^kN}j<>1oJj1Cg)C}Soz7d>Xh;404X*{jb)c_Q3S!_?UHe*%sE@L96D5C^!t54b4
zQH_#>)K$rs@EVk-1VmXtaH|HcdL(Co0c=ssm}14^;;HE}KElTx6na5Gm;z!)KrCMF
ztp!ox{KiDmVgNPXM@8<QjD1XV&n?sGHHcUE-jDCNp|;ZJXCUJTp^<+_j72vj1aoGs
zQdBdVc(gs|-{l<vfVW84&2Oa}F7eUe%_Tk=_Q}W3)6a-b$ozYamc>X9&w<1Vx)O=h
z39cU_nix7pUm|h)1pUVt{LRk3#lOA81am#iy@oD?(aq0L2r+sS4h|W-O^b+jUCF+6
zkb%p-4dJ%UjbFnCgP+M#@SI3`#>4My9X?39$HT*0hcii^Z4Z<tJxQ<a8Z1qEPcf1o
z7>s(N-V==e$~+fZ%z9WSLOxNl>cuenZDunLev{b*1Pe|9WBg4KAw>HQZ*J!Gi|58(
zhS?t<7&~^+JJ4Xe#{UR?`+a}mZr&Y!H<$N>@8|N~@O!yOV?&4cT9krz%Qs2rmQ5q(
zBsOXE^J^R+Y=k8~z=w>MFoo$xp)^k+o;PuX!4{~`b`IHqVulQ807`g(8G6K2+moXg
zlSi&h=889xpHnUYJbsGVJgY~KFz*~0uf85CuRF%4&hfeMJzYP+ql<NtZFR<*Bv&Z5
zL$XFGMV*Jg<BL-~6Qu_KK>h?@hu7;U(Cn*YBdm#g9WRftU563=wrN&{Y0<1>w~m9>
YmO8?xk>UJeEa2$$uu0)Z`doPZKm4h)UjP6A

literal 0
HcmV?d00001

diff --git a/target/classes/ImageCollector$1.class b/target/classes/ImageCollector$1.class
index e3fbe9facb4ad281593bcc829a5a6fc2f9fcf404..3217e3953d9958b4543e010dc0882cd5ba1081b6 100644
GIT binary patch
delta 19
bcmX@jcA9O&ekMlC$p@Gm7_BEWGJ634M&Jej

delta 19
bcmX@jcA9O&ekMlq$p@Gm7%e9=GJ634M!*I9

diff --git a/target/classes/ImageCollector.class b/target/classes/ImageCollector.class
index d8851a8a058c6094082aca73d63ba4a9ea8cd520..e4a1e08f679a2d0792eddf736cc116f8c62a204c 100644
GIT binary patch
literal 3837
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

literal 3800
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
T_BXx<@OS*f85caEI=}w`L^)q4

diff --git a/target/classes/IronMiner.class b/target/classes/IronMiner.class
index 9a6918f6c888194af7d756f86c905df5acc1ca15..3ddfe4610901e393666f018ea1ce975ec59d3447 100644
GIT binary patch
literal 4200
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

literal 4326
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

diff --git a/target/classes/ObjectDetector.class b/target/classes/ObjectDetector.class
index 09d73a99b91e65f901b5a2a48964d9a6146e9291..9ec4b0e9c3e0016b5bbdafaea068555c1cd0cf3b 100644
GIT binary patch
literal 6233
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

literal 5241
zcmb7I349dg75{(PV>X*ffHe^our94gPBtchkZ?$Vz+wU^iD*bMPIf1oh25R)>?|Z|
zt!>rXdi1ci)=JS<OHb>$L_ws7*lKTWZR<~axAs15)%q*_e>0n7L!vG0&V0vv-@E?r
zy>Iixe;z&tU^!k^P$E#VePE9swKnP&pN6TxEiikJwoeNuwRAk}><V~NModo%Eb1`K
zc-Yd@S;HJm8vDcD+CDwjDL314=~z;474WW3q!ZR!0ata+P677@?)u?EnF<9yAIb%K
z!$U?&563cECNt@@hI5uKU)mV9Wo5&r7L6K4x<95_T2{Bhrk>3ut!y|tq(}E=j6~Y%
zZ)#rIv?839I`rFIVFj~_4CuDZL^|%n9NLi8&3)A5G*l_56gcyBOi^(<=2HKpp~VEY
zRCi3c#W}UL@6@H5*L6@S1cE9&@CwZ8NTl^`xzvDe_Gkl1T_Dh5M788j%}mI7VbN_3
zC9*WDqc~Xf^}@JrMNA{T-P9$cl`zuTcGE~jQd*p+)l8#wjiYqVN+iSUO;a1`NMtP@
z<=-?M)id@93f?Ginr&{v2uHS$?+BE3C*o<%%9%X9^?yBmwIfp7Z-u*L+*;SRDmZ&g
zM6o7*EJm51KB`esi#qx!rR~*idwOix3Diw1cS<xJ;#L{%1{F&Y7ErQ!HcJl)%&$H*
zPR<?~&Ox(+CV|tZoY?J9s91*OM7fzur*)GlG2>Zh?XXE&eK=P@O~{b+JE`NxD$oTj
z0%uGwq`<0THP#S<gSt)#Zk@*Nsc<WpJ(GD8Dy<`)Vs_TkBmLQ^!Ss@9tyj^84a}B7
z-HHwgG*2V+^-td<FlXZQXj044_daZ9I470|jA2J+M8#H|&w@dpG6m>R8+$e|Y;^k3
ziR}uu2~<t-mt(JrF8HW(G-+g+;XBZypnD8ob|LE-GL8K*rBqx1R;6++7VFMsGPF7?
zeLHWmnd8K*H9O025q2r)WvMJyN<|;uLY<j`RI55tP<m3?WP~rK!4qYpou$N*wp^k@
z!vH~~4`*0+1!^aY-yq%9dWw_B5#5QH3LS&8qz!2qW}>^grf;hPhRfC0*DfXOQLz^+
z*xsm-8R;<u&Ymp6sUs9Ip<7`|0VCk<<0;;CFR)MWpG-zmMHbRdTDw6{Te@i{vMe=i
z#;`zTbzghow23U2sk~3cevrULe@i!=DzRo)DK5q33N9-y+#^{_PpNntt{}IOlfoTl
zmZUBgb&Ew<*HX-`D+L<186m^&WZ94dFg+I9pRk5PT4*Q{9}4MdBgdDG^QC^g6IUsC
z*BC;IPgHR=u3@#vNFhnOqe$yQ>6e|&H<(E3X)VP71SZ*4px_DAI+L^P%3X{dmfP8h
zDP?=yzT$dFQcohyV+7{TknFOu+4<W;oeH_eq1VnY4*V%?*a<IH5fSb<<N_sq?PM;n
zP>{_*qz@Ww=G|=3Y&_{WnRfA;U`Z_QP9vGI4pr~iKc2Cxr&o1#?ON7;fhCj3$9vE;
zT|!{_3<phJwx~-sd_g2_t+XZ7P9<=%ry#>lQac-M;__}wi|*~zGIqaJaI<^EN$}!w
z7kFd2Yb^7}f$hhgI3zDKpQg*IBN2%O7hOjm$?phVIuJLT%s4aLQ{C5Q--6^VMmoHW
zv{ouZI*uZf^I;5GGig4h@)cXG-~sj+8)ZauJAvuP{m4r#ukm9P4=Z?x2$KZEVY?N{
z&MsS0WV?zZILfSNIx$C=7IZ2cGgc&|^)_F)EjKu*n|jRVX1_d!;|d<-UBs3?1D%R5
z;mdRk>qiemMJH6(M11(FKzx&31DUVQ4Fe;V9%|dXgXtPIVuW5Okq#Bfs}I@O3@wg@
zs%84MgcfIOmWFzGK?;#Y=OdSlg$DFcO5-fWwiYstfn1h#w*n_rJdUq10R{~-rC9>2
zrU}60TirB;vJfUe79lT<e^SLa@J+|GjdqZOV-0M=7dtdoGn3BxHomLiJB3JurxK|6
z9-d-zqL<`Rj^(^0oO<BIHoMICNixOx6Z>uSsUJ_{8L8(FonFx<Yx<8>d>&u$I7J>V
zY0L8}ej>wEN(Hv)tef=OG5k!$&*iF*s~09>){uf<@(wjK9{u<=UQqCxvHF@OmZTbv
zJt}^S-%*eKrp7b~$^>!BK`|Mf)rmi-_#^%#+Ze%V5jN{52h3@deOsqxpQ(QmdWjTk
z+8Z3Mi4YXwj77@dw!UY>mj3R@u1(C=t+ao`mi61VZR+67qNI;=f47k{qq<BsTIxV$
zW8sI?QW+0sWJF#PZ9R1sU$1i`By^|+9WVIh4*~m01i{CZQqCe=lY4V(55r#@P~DH9
zqSqCe-93uHgP3<Ow@NUd&kFmPTDVciUn})kz%|uj#X_9H84bmmqzZBD=4=t(#8C;(
zl7if4a%~ogo)eu%u(<aymTVI(ZqeeY8%1@CxAp<d%cDMz#=wf8H;<KpwRxNu*eD<E
zeB`mEGw3~mRdTcA5YB0F%c;+v2HlUgc!KW7;SYLR+=nnH=ni`B;*766-pp-BRK4pV
zTv&qR=nU-6qrb&l?=D_Y>OI8^_W4nF_}UevL9e^2^fAOs@<<#<+||_L4=Pia%7Q*F
zDUTuLvdK~;Q(Y^{T`MXMVM)+mRnd4uC5&5cgZB_B-7Cr)YJ+N3MblxtHILkdS5=6r
zilG149VefuD!&zF_hBUP_B`GZ^qs)`pwG5EK+8Gx*;ASpR8C-7P_g&wU(*dF^x1@x
zi_YsV`11VM<oZ9n+;9)P1V;-tGw`#qlmCIc#WJy;?*pPs?B@G=agDf%@5{tdag=Yj
z4X-N*9Ux4&H1ZnQ#8Z}WeK~=(f`B>~OR$olTg9JDEnI2ksF|bH$YCw6$2uIqdAJ+x
z>_40FB(~srBKvPRA1|T<|3;_q@k(EYE>XeT`a*PwCAdJ;^LoAv7l~)lYs2|Qf}8*?
zz*&yojcW<y5>mVe@1<^j@f5D3JQwv_gBx%o?Y&+!;C=S!0E^N4IZ~*}L41HCAN9E$
zAH+>efhUo`hj25kd!ByzFh^z7unix<5EJP|+Hea#igLU}FWgFw3Ve(nSxX6y{M*Lm
z9~hVa@p1VFIdbG59G8EP@^9xEcVfXwx<yeS6jUg<NWo$SJM2%VT-)&q%G&rUFMk;&
zCwVEIH7%)vPJT##hy95Q7LHl7$xw;X*I)oT91$h*U0(hQN+(9+Vrd=k{q(l1O8bZk
zH{WLmK2hgxtn)Sw>?u!Qw<hq(I#*+z$C<4?f;)Q`o^cqTx`&jLi_~uV?qWu<-;Sy*
zSv+YhsvLcWzUNg7^YB^vxr94@e2ya*-|SNb9j;`(l$CRlYxN<_t6k8%rglN?0?#GQ
zJ@UD*=PKb^P|HkxLDoo@4dVF>0uUpkPBR8E2XV~hJjBq;dKq#KBs{*zSqbZ<474=4
z0{7rvuH4Rb{<Z8?ctj<&;h!bQ65`_If_k6rqmvZl<4)oT?(b#wesC0rJL>Xy#CH&t
zN3f_j@D<l1aE;=z!}$86+;}37Zym?edHkTWeiT3Qw^icVb3Mw@vR;?JtJh76=dSMR
z_3-^uzP;S-YEc5e2r8uh)hK>1-R#)eM8E<`K2wZ+nvTrS7K0T(%^zYGQ*%F4c9=;z
zLI7Wi-MGxQUxJwm+i4}c$8P)?f1&-&Olj$p5^^-+uS^RU`Red@jy$B2zd`>&zuZo4
cHm+ACe2<a(Mb1m`PyCB-dC!pL;U&!ZFINdyQvd(}

diff --git a/target/classes/Paths.class b/target/classes/Paths.class
index e9412ecb470e0216a383c270782d66cc54dabd35..be1bab756cc2509f3a99eec155a136bfde7ecbdd 100644
GIT binary patch
delta 257
zcmdnW_LZIM)W2Q(7#J8#8B{lNNic<Kg}C|!`v<xC_=m@b1UY*8dHT7>d-^)MyT<#6
zh6IF$#JhL~xjKjV2SqY6C?YBL^>=agiT81Ia`g$0ck}ddjSp}P@!(*PWMuH1e4Nol
zw4^98GcPkQT|Xx=DK)29uOO+UqGYlHlN6gA4}%ng^kfI7Xh!zQbC?1%BpJjQ*cccY
z*ntjXVh~}FWDrN<O8{jUK{|k>3{ZtWn9sn#s<oX#b|YAeJdgw#0Mf1iBzeGWRt7}|
NB_NNHK^ZKg0sy${FjfEn

delta 113
zcmey$zLkyZ)W2Q(7#J8#85B2iNia=5#3aEc#ls-RAU^p4Q#2#%WE<u{4@L$?kO+{J
v04mi7(u_cwRckwg<VGNai9s4jvVjGe7-WEK9*6=4Sq3>EkC8zhtV#g@vPTXu

diff --git a/target/classes/cascadeTrainingImageCollector.class b/target/classes/cascadeTrainingImageCollector.class
index 1e937c43521d3533289fcc73ac56dee3e69f1419..30e6ea6239b5dd45d4f5e981b764b16683c22bf9 100644
GIT binary patch
delta 1327
zcmaKsS#KLv6vzK}#`f5gX^4k{!4A|35NbQ|Gzp2S&<3Qar72Dunl#33Ax!Ow?bPwO
zp2<=+7ih~?*2}(y0HweKqEOipk&uvh;ssuK;tTL0pykXsN~0n%lINa#eeUo4&thMQ
zo({{uUitAS00a2uk{lAb;JYQ}$6kgTMyiHx8@Xt4PR|=dQ5hrHr$E6L84UXsJctzk
zMU44Ja6rL9jPvupduek>!2~9`Aa#;sAEp#SZ;|jY-zJ9I(>UTFjxtEwN9l=8$q3;Q
z1&?By9}*9C=?vm*B`+b%pv>wEx>hu`y~UCt<2d%om_b28p8q3;#Uf^T*t6n0sh|pr
z|Loc6n^&-aMSj(zZ9j!4Bs|X0>O%BITN^ivWn00MXklPW0i43q3Tk}H8;d@Nvl7lQ
zs2k2>=DcN$mS;=_=kPpV_9n+)#LE(1V%WOj<Pwc))9pMK8Cvp&oiek!T{O!wUd8JY
zUSnu;Z<O?MUYoG1#d2Q38+els`TE0tyu~0}*{Wfbt%7MgRer}Q=eztjUx)vF22Yae
z!9#)0@W%`{UL);U${H0Xjvvc>BG6G=VaR9&bI#Cm6}?i?Y$BS~nUcBK)0-Sf?$GAU
zoKdp0s-Df7W_dcN+qz}gTGg=TOSYwD3r6-t#VOKsU;oa&LCw+^jNG()OLKZo<!AUp
z!F{-cWa-tsMS_l|)+O;j14}IM!=&89c5!$h(oo$a?!Jh4yuE?@zei#XBN=s10}nU{
zqjikc@lYLyBWG7Jct&9DLGiDZtAFrsTf)P4;x5F{iGJLTZ3K!oakO^Oj=<Q37E&Xi
z7rV(4FifWsgumfsUEHU1j;1qh`L@GBb|uL6H;@^NUq-mQj$;RU)W_CvJQI(Qhz4@2
zFw&RkvVhy^t&(yePHO@YbR&r#eo_gAPPpMz+=de7$TxzmD8uB-N~~5P>R9*xQCnU4
zJ81HIDV@GeDMdF@ilP}qX_6_1;LJ5886-tn_-GF#;tklTHKa3%%UGhE+P$?>j_jvg
zyOeVl=R+xfNB+&MWcTg>ycl$2-`r%a$M&KNr}2ziPWt(*N9?7Q5kXqTvvs_14d!!?
zhg^_CcFie#voV76r$9%J;z`QcQ5<#JPKs_?#Vgc%l~dy*b-b;<*PMXs!NZ#rM*mZt
z06xHn#BC+Aha!E1V1djd>%qb_X6h$2RBK=v_0tAEOC^HR?{$2BeT%2yN1EE4!L2y9
ZDP$NI@Ffvd`u-wKn^T0ZXfNRFe*w#i4QT)X

delta 2088
zcmbVNYj+b>6x}zIWYXyXO)M6Y6w>loP0}{2MUf>BVWm7$+muI335Yr*({xIjge2vq
z64avj21gWpS4DgwPm@X&1>Y!s^cVQS-{5kA=T2f<z~u*%mAPl`+<VSGd+)i~?>z32
zu3Wot5x||edPb@dS{wt)P9>o1$_3V|(VUWuCsYYRtdb#PHG|j?qK|i@gc^iowBufV
zk-2M5CxbAMj*IAGkc|vlDzHl9dl}ZrSdR_*Ho;pJMh{OkMM5tkA~xwK%}!x6w&+*P
zBi3y)qKN4`EQ_ptGUDjhPgw#D14xM2&M<Wx*xHnq%*hx;B?H@CfdQmsq;;#+>&aoK
zh#`iFE;>^~Sv8dGqb0krTko<qFW8HRMLfh%ePc#7Q(E>2`WY(YYOW&{RdQM?DI%}W
z7MvalkK%C=k1<pkI}^lCU_&mWCF3%NaX`OnUEr6n4?Q*<WRSAajH)KH{iz(Ed|Jjc
zc$UGcq|<6L#?W;5Qnh|gaM||ZdH(DL-6_^N4l|gWiAugjm+=yg=)Vc|d4`&dn$`BI
zp+P0CW<$v~EkpXGGJ9+|%CIERpBhvHu{0$Qw5i$cxl}r^ekiGCqe@y`5n8K7vw@&O
zcQLg)qi9LO9OzcFIX+4V<5d~2;dO?JgqF>5;j#?&2Je=Rl9>6Dnv40;H)Xtqx2X{=
z%NLUJ4c^UM=XYehi}#4TNk~bGhH{Q_3Nnuk?=#qfnG`V*BU;1wK*onSLiQrs!^$Ap
zrWGH{WXdU2r!SS*5>qo|fg3YXC62bMuZ(xvKWNL9M4aM2J1gTH&J(Q}RUz7&Z^Gl%
zLl#d(0iz;{3~s&M;&#jU92ZI^*f6wB<CHVZEm@zI&vFq_#%zfIxzupX&_)l6_0F#u
zZkzDP%H2^l&7EY!Wj!y}b$!dQ;{PZXOeu-58YfroR7p059)9^j7j1`F<+-D_Ce}0z
z69jsn=Lt(sz~yrnvHUFj?gCm|cHxiy1EW|tY+`PTN3Q>_Gs(Hkj`?t+9&^!v*|gJB
z+D~I0-BBhiK_!(j(VC?cnXrszMVS7Ah1KX0sXiZ!RK=@$?ChGIwHL9n({~=u#sb!a
zn;acu2uFObBGwksJ&KLJXK1qtv*_x8nXY~s8{t9|n(4~{_>B3$IDi1|GXOYHi><hy
zcDqoG2k;;PHPPxh`kzu=UZHxOjsI0|s?k^roj<KqXThXqJ>#`J<yvyNf{7~7p+xQ5
z30V|Yx+l!OB2?-u81bKnM%}tC`9zH3q!A}#eBeJK<20==^(z^B7s7(OjM}%Ca+Paa
zNQNEA7(~<ASFYGXBclxBD6$3YnMh_erWYHDWQz5fvYe-5mO_rS+u#Q9jA37dkW3%N
z{vw`mJXyd~t^%HO9HO9r7jI5@&m?4?TUasSW#YwzsZ_yCmF60?E>p~vY|nG89j}nk
z9sUB2bqdQ)ptZ5KwSYH{VZM)|+9F2CjvSQZIN>oKo+v>n;G<!I)iz!nx&A9RiC~zd
z9yW@DkkE!{SViSmlMU98D??aL_aSr`khy8{grSUCqKBX0Bw?I}#rPDb2(=xH3<C>>
zfyoWmP%R=X;xzMfo$2tprMH8mxP<`t{G&J%Zkn)p0iWG%o@p-ojf5tD=l|8<U6f!Q
zrqh3*m*n9FzoV3LoL(Qs45-}t-0CKJJ`V>CgHNZOUr=O51-`_^NdUhx$lp{JdIr(j
z>$pTDj)6rS-xTp(hu>Df_cy<9y+r6HdgnINKls*3YR|xr_=&(dsN*a2>T}=yO!p@I
F@;5ETwtD~o