Ignore:
Timestamp:
2019-08-26T16:44:52+12:00 (5 years ago)
Author:
cpb16
Message:

made progress with morphology. Need to have a better area dimension threshold setup

File:
1 edited

Legend:

Unmodified
Added
Removed

  • other-projects/is-sheet-music-encore/trunk/Makefile

    r33415 r33437  
     1#**********
     2#Utilities/Test
     3#**********
     4
    15compile:
    26    cd java-gen-corpus; javac *.java;
    3 #*******
    4 
    57
    68download-single:
    7     ./COMPX520-RUN-PNG.sh coo1.ark:/13960/t2t448j81 1
    8 
    9 
     9    ./COMPX520-RUN-PNG-hi-res.sh coo1.ark:/13960/t2t448j81 1 /..
     10   
     11test-get-page-numbers-map:
     12    cd java-gen-corpus; javac javaGenMapPageCountChecker.java
     13    cd java-gen-corpus; java javaGenMapPageCountChecker gen-500-MP-hathiFullIDList.txt 234 MapListNumPages.txt
     14
     15
     16test-gen-new-5000-map:
     17    #MAKE SURE TO RUN source SETUP.bash prior to this cmd
     18    cd java-gen-corpus; javac javaGenMap5000ValidIDList.java
     19    cd java-gen-corpus; java javaGenMap5000ValidIDList gen-500-MP-hathiFullIDList.txt gen-5000-MapList02.txt
     20   
     21test-gen-new-5000-local-map:
     22    #MAKE SURE TO RUN source SETUP.bash prior to this cmd
     23    cd java-gen-corpus; javac javaGenMapLocal5000ValidIDList.java
     24    cd java-gen-corpus; java javaGenMapLocal5000ValidIDList MapListNumPages.txt gen-5000-Local-MapList.txt
     25   
     26   
     27run-morphology-100-test:
     28    cd image-identification-terminal/log-all-hires-new; rm log-morphology-MU-test.txt
     29    cd image-identification-terminal; javac javaAccuracyCalculator.java
     30    cd image-identification-terminal; javac -cp /Scratch/cpb16/opencv-3.4.2/build/bin/opencv-342.jar javaClassifierComparison.java;
     31    cd image-identification-terminal; ./runClassifer.sh /Scratch/cpb16/is-sheet-music-encore/hires-download-images/MU morphology log-all-hires-new/log-morphology-MU-test.txt -testNew
     32    cd image-identification-terminal; java javaAccuracyCalculator log-all-hires-new/log-morphology-MU-test.txt morphology-MU log-all-hires-new/results.txt
     33    cd image-identification-terminal; less log-all-hires-new/results.txt
     34    cd image-identification-terminal; less log-all-hires-new/log-morphology-MU-test.txt
     35
     36run-morph-single:
     37    cd image-identification-terminal; make testrun-classifier-single-morph
    1038#**********
    1139#HI-RES
    … …  
    1644    ./COMPX520-DOWNLOADER-PNG-10PAGES-hi-res.sh java-gen-corpus/BK-500-reconstructed.txt BK
    1745    ./COMPX520-DOWNLOADER-PNG-10PAGES-hi-res.sh java-gen-corpus/SE-500-reconstructed.txt SE
    18     ./COMPX520-DOWNLOADER-PNG-10PAGES-hi-res.sh java-gen-corpus/MP-500-reconstructed.txt MP
     46    make hi-res-download-map
     47hi-res-download-map:
     48    ./FirstAndLastTest-DOWNLOADER-PNG.sh java-gen-corpus/gen-5000-Local-MapList.txt MP
    1949
    2050######################################
    2151#CAUTION: run must: source SETUP.bash
    22 #Prior to running the scripts below
     52#Prior to running the gen-* scripts
    2353######################################
    24 #MUSIC, Including Sheet music
    25 gen-500-MU:
    26     cd java-gen-corpus; javac *.java
    27     cd java-gen-corpus; java javaGenFullIDList hathiFull.txt gen-500-MU-hathiFullIDList.txt MU
    28     cd java-gen-corpus; java javaGenValidIDList gen-500-MU-hathiFullIDList.txt 500 gen-500-MU-hathiValidIDList.txt
    29     ./COMPX520-DOWNLOADER-PNG-10PAGES.sh java-gen-corpus/gen-500-MU-hathiValidIDList.txt
    30 
    31 
    32 #BOOKS, Monograhpical
    33 gen-500-BK:
    34     cd java-gen-corpus; javac *.java
    35     cd java-gen-corpus; java javaGenFullIDList hathiFull.txt gen-500-BK-hathiFullIDList.txt BK
    36     cd java-gen-corpus; java javaGenValidIDList gen-500-BK-hathiFullIDList.txt 500 gen-500-BK-hathiValidIDList.txt
    37     ./COMPX520-DOWNLOADER-PNG-10PAGES.sh java-gen-corpus/gen-500-BK-hathiValidIDList.txt
    38 
    39 
    40 #SERIAL (journals, newspapers,etc)
    41 gen-500-SE:
    42     cd java-gen-corpus; javac *.java
    43     cd java-gen-corpus; java javaGenFullIDList hathiFull.txt gen-500-SE-hathiFullIDList.txt SE
    44     cd java-gen-corpus; java javaGenValidIDList gen-500-SE-hathiFullIDList.txt 500 gen-500-SE-hathiValidIDList.txt
    45     ./COMPX520-DOWNLOADER-PNG-10PAGES.sh java-gen-corpus/gen-500-SE-hathiValidIDList.txt
    46 
    47 
    48 #MAPS, Including atlas and sheet maps
    49 gen-500-MP:
    50     cd java-gen-corpus; javac *.java
    51     cd java-gen-corpus; java javaGenFullIDList hathiFull.txt gen-500-MP-hathiFullIDList.txt MP
    52     cd java-gen-corpus; java javaGenValidIDList gen-500-MP-hathiFullIDList.txt 500 gen-500-MP-hathiValidIDList.txt
    53     ./COMPX520-DOWNLOADER-PNG-10PAGES.sh java-gen-corpus/gen-500-MP-hathiValidIDList.txt
    54 
    55 
    56 #MIXED MATERIAL (This may not be required)
    57 gen-500-MX:
    58     cd java-gen-corpus; javac *.java
    59     cd java-gen-corpus; java javaGenFullIDList hathiFull.txt gen-500-MX-hathiFullIDList.txt MX
    60     cd java-gen-corpus; java javaGenValidIDList gen-500-MX-hathiFullIDList.txt 500 gen-500-MX-hathiValidIDList.txt
    61     ./COMPX520-DOWNLOADER-PNG-10PAGES.sh java-gen-corpus/gen-500-MX-hathiValidIDList.txt
     54gen-10000-MU:
     55    cd java-gen-corpus; javac *.java
     56    cd java-gen-corpus; java javaGenFullIDList hathiFull.txt gen-10000-MU-hathiFullIDList.txt MU
     57    cd java-gen-corpus; java javaGenFirstAndLastTenIDList gen-10000-MU-hathiFullIDList.txt 10000 gen-10000-MU-hathiValidIDList.txt
     58    #./FirstAndLastTest-DOWNLOADER-PNG.sh java-gen-corpus/gen-10000-MU-hathiValidIDList.txt MU
     59
    6260
    6361#***********
    6462#CLASSIFIERS
    65 #***********
     63#***********   
    6664run-cluster-single-test:
    6765    cd image-identification-terminal; make testrun-classifier-single-cluster
    68    
     66
    6967run-count-single-test:
    7068    cd image-identification-terminal; make testrun-classifier-single-count
    71    
     69
    7270run-cluster-corpus-hires:
    7371    #Compile
    7472    cd image-identification-terminal; javac javaAccuracyCalculator.java
    75     cd image-identification-terminal; javac -cp /Scratch/cpb16/opencv-3.4.2/build/bin/opencv-342.jar javaImageClassifier.java;
     73    cd image-identification-terminal; javac -cp /Scratch/cpb16/opencv-3.4.2/build/bin/opencv-342.jar javaClassifierComparison.java;
    7674    #Run classifier
    77     cd image-identification-terminal; /runClassifer.sh /Scratch/cpb16/is-sheet-music-encore/hires-download-images/MU cluster log-all-hires-new/log-cluster-MU.txt -allNew
    78     cd image-identification-terminal; /runClassifer.sh /Scratch/cpb16/is-sheet-music-encore/hires-download-images/BK cluster log-all-hires-new/log-cluster-BK.txt -allNew
    79     cd image-identification-terminal; /runClassifer.sh /Scratch/cpb16/is-sheet-music-encore/hires-download-images/MP cluster log-all-hires-new/log-cluster-MP.txt -allNew
    80     cd image-identification-terminal; /runClassifer.sh /Scratch/cpb16/is-sheet-music-encore/hires-download-images/SE cluster log-all-hires-new/log-cluster-SE.txt -allNew
     75    cd image-identification-terminal; ./runClassifer.sh /Scratch/cpb16/is-sheet-music-encore/hires-download-images/MU cluster log-all-hires-new/log-cluster-MU.txt -allNew
     76    cd image-identification-terminal; ./runClassifer.sh /Scratch/cpb16/is-sheet-music-encore/hires-download-images/BK cluster log-all-hires-new/log-cluster-BK.txt -allNew
     77    cd image-identification-terminal; ./runClassifer.sh /Scratch/cpb16/is-sheet-music-encore/hires-download-images/MP cluster log-all-hires-new/log-cluster-MP.txt -allNew
     78    cd image-identification-terminal; ./runClassifer.sh /Scratch/cpb16/is-sheet-music-encore/hires-download-images/SE cluster log-all-hires-new/log-cluster-SE.txt -allNew
    8179    #Calculate accuracy
    8280    cd image-identification-terminal; java javaAccuracyCalculator log-all-hires-new/log-cluster-MU.txt cluster-MU log-all-hires-new/results.txt
    … …  
    8684    #Display the results
    8785    cd image-identification-terminal; less log-all-hires-new/results.txt
    88    
     86
    8987run-count-corpus-hires:
    9088    #Compile
    9189    cd image-identification-terminal; javac javaAccuracyCalculator.java
    92     cd image-identification-terminal; javac -cp /Scratch/cpb16/opencv-3.4.2/build/bin/opencv-342.jar javaImageClassifier.java;
     90    cd image-identification-terminal; javac -cp /Scratch/cpb16/opencv-3.4.2/build/bin/opencv-342.jar javaClassifierComparison.java;
    9391    #Run classifier
    94     cd image-identification-terminal; /runClassifer.sh /Scratch/cpb16/is-sheet-music-encore/hires-download-images/MU count log-all-hires-new/log-count-MU.txt -allNew
    95     cd image-identification-terminal; /runClassifer.sh /Scratch/cpb16/is-sheet-music-encore/hires-download-images/BK count log-all-hires-new/log-count-BK.txt -allNew
    96     cd image-identification-terminal; /runClassifer.sh /Scratch/cpb16/is-sheet-music-encore/hires-download-images/MP count log-all-hires-new/log-count-MP.txt -allNew
    97     cd image-identification-terminal; /runClassifer.sh /Scratch/cpb16/is-sheet-music-encore/hires-download-images/SE count log-all-hires-new/log-count-SE.txt -allNew
     92    cd image-identification-terminal; ./runClassifer.sh /Scratch/cpb16/is-sheet-music-encore/hires-download-images/MU count log-all-hires-new/log-count-MU.txt -allNew
     93    cd image-identification-terminal; ./runClassifer.sh /Scratch/cpb16/is-sheet-music-encore/hires-download-images/BK count log-all-hires-new/log-count-BK.txt -allNew
     94    cd image-identification-terminal; ./runClassifer.sh /Scratch/cpb16/is-sheet-music-encore/hires-download-images/MP count log-all-hires-new/log-count-MP.txt -allNew
     95    cd image-identification-terminal; ./runClassifer.sh /Scratch/cpb16/is-sheet-music-encore/hires-download-images/SE count log-all-hires-new/log-count-SE.txt -allNew
    9896    #Calculate accuracy
    9997    cd image-identification-terminal; java javaAccuracyCalculator log-all-hires-new/log-count-MU.txt count-MU log-all-hires-new/results.txt
    … …  
    103101    #Display the results
    104102    cd image-identification-terminal; less log-all-hires-new/results.txt   
    105    
    106    
    107 
    108 
    109 
    110 
    111 
    112 
    113 
    114 
    115 
    116 
    117 
    118 
    119 
    120 
    121 
    122 
    123 #***********
     103
     104#Cluster and Count
     105run-combo-corpus-hires:
     106    #Compile
     107    cd image-identification-terminal; javac javaAccuracyCalculator.java
     108    cd image-identification-terminal; javac -cp /Scratch/cpb16/opencv-3.4.2/build/bin/opencv-342.jar javaClassifierComparison.java;
     109    #Run classifier
     110    cd image-identification-terminal; ./runClassifer.sh /Scratch/cpb16/is-sheet-music-encore/hires-download-images/MU combo log-all-hires-new/log-combo-MU.txt -allNew
     111    cd image-identification-terminal; ./runClassifer.sh /Scratch/cpb16/is-sheet-music-encore/hires-download-images/BK combo log-all-hires-new/log-combo-BK.txt -allNew
     112    #cd image-identification-terminal; ./runClassifer.sh /Scratch/cpb16/is-sheet-music-encore/hires-download-images/MP combo log-all-hires-new/log-combo-MP.txt -allNew
     113    cd image-identification-terminal; ./runClassifer.sh /Scratch/cpb16/is-sheet-music-encore/hires-download-images/SE combo log-all-hires-new/log-combo-SE.txt -allNew
     114    #Calculate accuracy
     115    cd image-identification-terminal; java javaAccuracyCalculator log-all-hires-new/log-combo-MU.txt combo-MU log-all-hires-new/results.txt
     116    cd image-identification-terminal; java javaAccuracyCalculator log-all-hires-new/log-combo-BK.txt combo-BK log-all-hires-new/results.txt
     117    #cd image-identification-terminal; java javaAccuracyCalculator log-all-hires-new/log-combo-MP.txt combo-MP log-all-hires-new/results.txt
     118    cd image-identification-terminal; java javaAccuracyCalculator log-all-hires-new/log-combo-SE.txt combo-SE log-all-hires-new/results.txt
     119    #Display the results
     120    cd image-identification-terminal; less log-all-hires-new/results.txt
     121
     122
     123
     124
     125
     126
     127
     128
     129
     130
     131
     132
     133
     134
     135#**************
     136#OLD SCRIPTS
     137#**************
    124138#OLDCLASSIFIERS
    125 #***********
     139#**************
    126140run-houghlinesP-refined-corpus:
    127141    #cd image-identification-terminal; cd log-all; rm *.txt
    … …  
    159173        #Display the results
    160174    cd image-identification-terminal; less log-all-hires/results.txt   
     175   
     176#***********
     177#OLDGEN
     178#***********   
     179    #MUSIC, Including Sheet music
     180gen-500-MU:
     181    cd java-gen-corpus; javac *.java
     182    cd java-gen-corpus; java javaGenFullIDList hathiFull.txt gen-500-MU-hathiFullIDList.txt MU
     183    cd java-gen-corpus; java javaGenValidIDList gen-500-MU-hathiFullIDList.txt 500 gen-500-MU-hathiValidIDList.txt
     184    ./COMPX520-DOWNLOADER-PNG-10PAGES.sh java-gen-corpus/gen-500-MU-hathiValidIDList.txt
     185
     186
     187#BOOKS, Monograhpical
     188gen-500-BK:
     189    cd java-gen-corpus; javac *.java
     190    cd java-gen-corpus; java javaGenFullIDList hathiFull.txt gen-500-BK-hathiFullIDList.txt BK
     191    cd java-gen-corpus; java javaGenValidIDList gen-500-BK-hathiFullIDList.txt 500 gen-500-BK-hathiValidIDList.txt
     192    ./COMPX520-DOWNLOADER-PNG-10PAGES.sh java-gen-corpus/gen-500-BK-hathiValidIDList.txt
     193
     194
     195#SERIAL (journals, newspapers,etc)
     196gen-500-SE:
     197    cd java-gen-corpus; javac *.java
     198    cd java-gen-corpus; java javaGenFullIDList hathiFull.txt gen-500-SE-hathiFullIDList.txt SE
     199    cd java-gen-corpus; java javaGenValidIDList gen-500-SE-hathiFullIDList.txt 500 gen-500-SE-hathiValidIDList.txt
     200    ./COMPX520-DOWNLOADER-PNG-10PAGES.sh java-gen-corpus/gen-500-SE-hathiValidIDList.txt
     201
     202
     203#MAPS, Including atlas and sheet maps
     204gen-500-MP:
     205    cd java-gen-corpus; javac *.java
     206    cd java-gen-corpus; java javaGenFullIDList hathiFull.txt gen-500-MP-hathiFullIDList.txt MP
     207    cd java-gen-corpus; java javaGenValidIDList gen-500-MP-hathiFullIDList.txt 500 gen-500-MP-hathiValidIDList.txt
     208    ./COMPX520-DOWNLOADER-PNG-10PAGES.sh java-gen-corpus/gen-500-MP-hathiValidIDList.txt
     209
     210
     211#MIXED MATERIAL (This may not be required)
     212gen-500-MX:
     213    cd java-gen-corpus; javac *.java
     214    cd java-gen-corpus; java javaGenFullIDList hathiFull.txt gen-500-MX-hathiFullIDList.txt MX
     215    cd java-gen-corpus; java javaGenValidIDList gen-500-MX-hathiFullIDList.txt 500 gen-500-MX-hathiValidIDList.txt
     216    ./COMPX520-DOWNLOADER-PNG-10PAGES.sh java-gen-corpus/gen-500-MX-hathiValidIDList.txt
     217
Note: See TracChangeset for help on using the changeset viewer.