Changeset 33325 for other-projects/is-sheet-music-encore/trunk/image-identification-development/src/Main.java

Timestamp:

2019-07-11T18:33:51+12:00 (5 years ago)

Author:

cpb16

Message:

Added x pos checker, needs testing, and remove errors

File:

• other-projects/is-sheet-music-encore/trunk/image-identification-development/src/Main.java (modified) (3 diffs)

other-projects/is-sheet-music-encore/trunk/image-identification-development/src/Main.java

@@ -180 +180 @@
 
     }
-    public static Boolean ClusterCheck(StartAndEndPoint parseArray[]){
-        System.out.println("LENGTH: " + parseArray.length);
-        //MAKE THREE COMPARISONS
-        //After clusters have been found.
-        //Check if  their x positions intersect
-        //Logic being
-        //(L1.S < L2.E && L1.S > L2.S)
-        //or
-        //(L2.S < L1.E && L2.S > L1.S)
-        //Variance is using Start of line point.
-        //USING VARIANTS
+    public static double VarianceCalc(StartAndEndPoint parseArray[]){
         double sum =0;
         double temp =0;
@@ -207 +197 @@
         variance = Math.abs(temp/(size -1));
         System.out.println("VARIANCE: " + variance);
-        if(variance <= CLUSTER_DISTANCE_MAX && variance > CLUSTER_DISTANCE_MIN){
-            for(int i = 0; i < 3; i++){
-                double l1_S = parseArray[i].getP1().x;
-                double l1_E = parseArray[i].getP2().x;
-                double l2_S = 
-
-            }
+        return variance;
+    }
+    public static Boolean lineComparison(double baseLineS, double compareLineS, double compareLineE ){
+        if(baseLineS < compareLineE && baseLineS > compareLineS){
+            return true;
         }
         return false;
+    }
+    public static Boolean ClusterCheck(StartAndEndPoint parseArray[]){
+        try {
+            System.out.println("LENGTH: " + parseArray.length);
+            //MAKE THREE COMPARISONS
+            //After clusters have been found.
+            //Check if  their x positions intersect
+            //Logic being
+            //(L1.S < L2.E && L1.S > L2.S)
+            //or
+            //(L2.S < L1.E && L2.S > L1.S)
+            //Variance is using Start of line point.
+            //USING VARIANTS
+            double variance = VarianceCalc(parseArray);
+            Boolean consistent = false;
+            if (variance <= CLUSTER_DISTANCE_MAX && variance > CLUSTER_DISTANCE_MIN) {
+                for (int i = 0; i < parseArray.length - 1; i++) {
+                    System.out.println(i);
+                    double l1_S = parseArray[i].getP1().x;
+                    double l1_E = parseArray[i].getP2().x;
+                    double l2_S = parseArray[i + 1].getP1().x;
+                    double l2_E = parseArray[i + 1].getP2().x;
+
+                    //Check which starts after
+                    if (l1_S >= l2_S) {
+                        //baseLineStart is l1_S (call with lineComparison)
+                        consistent = lineComparison(l1_S, l2_S, l2_E);
+
+                    } else if (l2_S > l1_S) {
+                        //baseLineStart is l2_S (call with lineComparison)
+                        consistent = lineComparison(l2_S, l1_S, l1_E);
+                    } else {
+                        System.err.println("An error, comparing l1_S and l2_S, has occurred");
+                    }
+
+                    //Check if false was returned;
+                    if (consistent == false) {
+                        System.out.println(" X positions of two lines did not overlap each other" + '\t');
+                        System.out.print("l1_S: " + l1_S + '\t');
+                        System.out.print("l1_E: " + l1_E + '\t');
+                        System.out.print("l2_S: " + l2_S + '\t');
+                        System.out.print("l2_E: " + l2_E);
+                        return false;
+                    }
+                }
+                //Have been through for loop, maintaining consistent being true.
+                //Have also meet the variance MIN and MAX requirement. Therefore it is a cluster
+                return true;
+            }
+            System.out.println("Did not meet Cluster Distance Min and Max requirements, Variance = " + variance);
+            return false;
+        }
+        catch (Exception e){
+            System.err.println("           "+e.getMessage());
+            return false;
+        }
     }
 
@@ -680 +724 @@
         }
         catch (Exception e) {
-            System.err.println(e);
+            System.err.println("          " +e.getMessage());
         }
         return returnArray;