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

Timestamp:

2019-07-22T16:46:33+12:00 (5 years ago)

Author:

cpb16

Message:

transferred backup of low res images. Classifiers work as expected. Updated javaAccuracyCalculator, now calculates overall rating correctly. Created gen-50-XX-ValidIDList.txt for the 10% high-res downloads. Done by selecting first 50 of each gen-500-XX-Valid.... .txt. Downloading high-res images after this backup

File:

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

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

@@ -144 +144 @@
             return "Start: " + _p1 + " End: " + _p2;
         }
-        /*
-        //CompareToOverride
-        //Compares start point y co ordinates of input PointArray
-        //With this. start point y co ordinate
-        @Override
-        public double compareTo(StartAndEndPoint comparePointArray){
-            Point comparePoint = (comparePointArray.getP1());
-            return (this.getP1().y) - (comparePoint.y);
-        }
-        */
-    }
+
+    }
+
     public static <T> ArrayList<T> removeDuplicates(ArrayList<T> list) {
         //DIRECTLY COPIED//DIRECTLY COPIED//DIRECTLY COPIED//DIRECTLY COPIED//DIRECTLY COPIED//DIRECTLY COPIED
@@ -211 +203 @@
     }
     public static Boolean lineComparison(double baseLineS, double compareLineS, double compareLineE ){
+        //System.out.print("Comparing baseLineS: " + baseLineS + " with compareLineE: " + compareLineE + " and compareLineS: " + compareLineS);
         if(baseLineS < compareLineE && baseLineS > compareLineS){
             return true;
@@ -231 +224 @@
             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);
@@ -658 +652 @@
                             //If it SD is less than 5 then it is considered to be a cluster of lines.
                             if(ClusterCheck(tempPtArray)){
-                                //System.out.println("tempArray PT: "+tempArray[0] + " , " + tempArray[1] + " , " + tempArray[2] + " , " + tempArray[3]);
-                                //System.out.println("tempArray SD: " + StandardDeviation(tempArray));
+                                //System.out.println("tempArray PT: "+tempPtArray[0] + " , " + tempPtArray[1] + " , " + tempPtArray[2] + " , " + tempPtArray[3]);
                                 //Store array
                                 clusterPtArray.add(tempPtArray);
@@ -671 +664 @@
                                     //break
                                     Thread.sleep(2000);
-                                    System.out.println("End of closeLinePts -> break , i = " + i+ " closeLineYpos size= " + closeLinePts.size());
+                                    //System.out.println("End of closeLinePts -> break , i = " + i+ " closeLineYpos size= " + closeLinePts.size());
                                     break;
                                 }
@@ -678 +671 @@
                     }
                 }
-                /*
-                System.out.println("Cluster Coordinates: ");
-                for(double[] items : clusterArray){
-                    for(int i = 0; i <items.length; i++){
-                        System.out.println("ITEMS: "+ items[i]);
-                    }
-                }
-                */
+
+                /*System.out.println("Cluster Coordinates: ");
+                for(StartAndEndPoint[] items : clusterPtArray){
+                    for(int i = 0; i <clusterPtArray.size(); i++){
+                        System.out.println("ITEMS: "+ items);
+                    }
+                }*/
+
                 //Setup Drawing clusters found.
                 //For every pt given the input array
@@ -723 +716 @@
     }
 
+    //SUPER CLASSIFIER FUNCTIONS
+    private static boolean LineCountOrCluster(int lineCount, ArrayList<StartAndEndPoint> linePointsArray, Mat clustersFoundRGB){
+        ArrayList lineClusterResult = ClassifierLineClusterPt(linePointsArray, clustersFoundRGB);
+
+
+        //String test = ClassifierLineClusterPt(linePointsArray, clustersFoundRGB).get(0).toString();
+        if(ClassifierLineCount(lineCount) == true){
+            System.out.println("LineCount classifier Successful: " +   '\t' +"LinesFound: " + lineCount);
+            return true;
+        }
+        else if(lineClusterResult.get(0).toString() == "true"){
+            System.out.println("LineCluster classifier Successful: " + '\t' + "LinesFound: " + lineCount + '\t' + "ClustersFound: " + lineClusterResult.get(1));
+
+            return  false;
+        }
+        return false;
+    }
+
     //MAIN
     public static void main(String[] args) {
@@ -735 +746 @@
             Mat edgesDetectedRGB = new Mat();
             Mat clustersFoundRGB = new Mat();
-            String directory = "/Scratch/cpb16/is-sheet-music-encore/download-images/MU/";
+            String directory = "/Scratch/cpb16/is-sheet-music-encore/lowres-download-images/MU/";
             //!!!!!!!!!!!!!!!!!!!!!!!!!!!NOT!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
             //mdp.39015097852365-2.png 176 lines    Contents page.
             //mdp.39015097852555-3.png 76  lines
-            //String default_file = directory+"SheetMusic/coo.31924062612282-9.png";
-            //String default_file ="TestImages/NotNot/mdp.39015080972303-3.png";
+            //!!!!!!!!!!!!!!!!!!!!!!!!!!!NOTNOT!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+            //coo.31924062612282-9.png 8   lines
+            //String default_file = directory+"NotSheetMusic/coo.31924062612282-9.png";
+            //String default_file = directory+"NotSheetMusic/mdp.39015097852365-2.png";
+            String default_file ="TestImages/NotNot/mdp.39015080972303-3.png";
 
 
             //System.out.println(default_file);
-            String default_file = "TestImages/NotSheetMusic01.png";
+            //String default_file = "TestImages/NotSheetMusic01.png";
             //String default_file = "TestImages/NotSheetMusic02.png";
             //String default_file = "TestImages/SheetMusic01.png";
@@ -805 +819 @@
 
 
-            System.out.println("LINE COUNT RESULT:   " +  ClassifierLineCount(horizontalLineCount) + '\t' +"LinesFound: " + horizontalLineCount); //COUNT OF LINES CLASSIFICATION
+            //System.out.println("LINE COUNT RESULT:   " +  ClassifierLineCount(horizontalLineCount) + '\t' +"LinesFound: " + horizontalLineCount); //COUNT OF LINES CLASSIFICATION
             //System.out.println("LINE CLUSTER RESULT: " +  ClassifierLineClusterOLD(toBeClassifiedImg).get(0) + '\t' + "LinesFound: " + ClassifierLineClusterOLD(toBeClassifiedImg).get(1) + '\t' + "ClustersFound: " + ClassifierLineClusterOLD(toBeClassifiedImg).get(2));
-            System.out.println("NEW CLUSTER RESULTS: " +  ClassifierLineClusterPt(pointArrayList,clustersFoundRGB).get(0) + '\t' + "LinesFound: " + horizontalLineCount + '\t' + "ClustersFound: " + ClassifierLineClusterPt(pointArrayList,clustersFoundRGB).get(1));
+            //System.out.println("NEW CLUSTER RESULTS: " +  ClassifierLineClusterPt(pointArrayList,clustersFoundRGB).get(0) + '\t' + "LinesFound: " + horizontalLineCount + '\t' + "ClustersFound: " + ClassifierLineClusterPt(pointArrayList,clustersFoundRGB).get(1));
             //System.out.println(ClassifierLineClusterPt(pointArrayList, clustersFoundRGB));
+
+            System.out.println("TEST: " + LineCountOrCluster(horizontalLineCount, pointArrayList, clustersFoundRGB));
 
             // Wait and Exit