Changeset 33310 for other-projects/is-sheet-music-encore/trunk
- Timestamp:
- 2019-07-08T16:36:39+12:00 (5 years ago)
- Location:
- other-projects/is-sheet-music-encore/trunk/image-identification-development
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
other-projects/is-sheet-music-encore/trunk/image-identification-development/.idea/workspace.xml
r33304 r33310 3 3 <component name="ChangeListManager"> 4 4 <list default="true" readonly="true" id="9bad4f92-4a7d-46a2-b6f0-94214c9f55cc" name="Default" comment=""> 5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />6 <change beforePath="$PROJECT_DIR$/out/production/image-identification/Main.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/image-identification/Main.class" afterDir="false" />7 5 <change beforePath="$PROJECT_DIR$/src/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Main.java" afterDir="false" /> 8 6 </list> … … 20 18 <entry file="file://$PROJECT_DIR$/src/Main.java"> 21 19 <provider selected="true" editor-type-id="text-editor"> 22 <state relative-caret-position=" 801">23 <caret line=" 326" selection-start-line="326" selection-end-line="326" />20 <state relative-caret-position="506"> 21 <caret line="504" column="30" selection-start-line="504" selection-start-column="30" selection-end-line="504" selection-end-column="30" /> 24 22 <folding> 25 23 <element signature="imports" expanded="true" /> 26 24 <element signature="class#StartAndEndPoint#0;class#Main#0" /> 27 25 <element signature="method#removeDuplicates#0;class#Main#0" /> 28 <element signature="method#StandardDeviation#0;class#Main#0" />29 26 <element signature="method#toBufferedImage#0;class#Main#0" /> 30 27 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 31 28 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 32 29 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 33 <element signature="e#74 30#7439#0" expanded="true" />30 <element signature="e#7453#7462#0" expanded="true" /> 34 31 </folding> 35 32 </state> … … 75 72 <property name="project.structure.proportion" value="0.15" /> 76 73 <property name="project.structure.side.proportion" value="0.2" /> 74 <property name="run.code.analysis.last.selected.profile" value="pProject Default" /> 77 75 <property name="settings.editor.selected.configurable" value="preferences.lookFeel" /> 78 76 </component> … … 142 140 <component name="ToolWindowManager"> 143 141 <frame x="65" y="24" width="1855" height="1056" extended-state="6" /> 142 <editor active="true" /> 144 143 <layout> 145 144 <window_info anchor="right" id="Palette" order="4" /> 146 145 <window_info anchor="bottom" id="TODO" order="10" /> 146 <window_info anchor="bottom" id="Messages" order="3" weight="0.32822084" /> 147 147 <window_info anchor="right" id="Palette	" order="1" /> 148 148 <window_info id="Image Layers" order="4" /> … … 150 150 <window_info anchor="bottom" id="Event Log" order="1" side_tool="true" /> 151 151 <window_info anchor="right" id="Maven Projects" order="3" /> 152 <window_info active="true" anchor="bottom" id="Run" order="6" visible="true" weight="0.33742332" /> 152 153 <window_info anchor="bottom" id="Version Control" order="2" /> 153 <window_info anchor="bottom" id="Run" order="6" weight="0.22392638" />154 154 <window_info anchor="bottom" id="Terminal" order="0" weight="0.42638037" /> 155 155 <window_info id="Capture Tool" order="2" /> 156 156 <window_info id="Designer" order="0" /> 157 157 <window_info content_ui="combo" id="Project" order="5" weight="0.18382749" /> 158 <window_info anchor="bottom" id="Find" order="5" weight="0.32924336" /> 158 159 <window_info id="Structure" order="6" side_tool="true" weight="0.25" /> 159 160 <window_info anchor="right" id="Ant Build" order="6" weight="0.25" /> 160 161 <window_info id="UI Designer" order="1" /> 161 162 <window_info anchor="right" id="Theme Preview" order="2" /> 163 <window_info anchor="bottom" id="Debug" order="7" weight="0.398773" /> 162 164 <window_info id="Favorites" order="3" side_tool="true" /> 163 <window_info anchor="bottom" id="Debug" order="7" weight="0.39894736" />164 165 <window_info anchor="right" content_ui="combo" id="Hierarchy" order="7" weight="0.25" /> 165 166 <window_info anchor="bottom" id="Inspection" order="9" weight="0.4" /> … … 168 169 <window_info anchor="bottom" id="Message" order="4" /> 169 170 <window_info anchor="bottom" id="Cvs" order="8" weight="0.25" /> 170 <window_info anchor="bottom" id="Find" order="5" weight="0.32924336" />171 <window_info anchor="bottom" id="Messages" order="3" weight="0.32822084" />172 171 </layout> 173 172 <layout-to-restore> … … 177 176 <window_info anchor="bottom" id="Run" order="6" visible="true" weight="0.34662578" /> 178 177 <window_info anchor="right" id="Theme Preview" order="2" /> 179 <window_info anchor="bottom" id="Cvs" order="8" weight="0.25" />180 178 <window_info content_ui="combo" id="Project" order="5" visible="true" weight="0.18382749" /> 181 179 <window_info id="Structure" order="6" side_tool="true" weight="0.25" /> … … 183 181 <window_info anchor="right" id="Ant Build" order="6" weight="0.25" /> 184 182 <window_info anchor="bottom" id="TODO" order="10" /> 183 <window_info anchor="bottom" id="Version Control" order="2" /> 185 184 <window_info id="Image Layers" order="4" /> 186 185 <window_info id="Designer" order="0" /> … … 192 191 <window_info anchor="bottom" id="Event Log" order="1" side_tool="true" /> 193 192 <window_info anchor="bottom" id="Inspection" order="9" weight="0.4" /> 194 <window_info anchor="bottom" id=" Version Control" order="2" />193 <window_info anchor="bottom" id="Cvs" order="8" weight="0.25" /> 195 194 <window_info id="Capture Tool" order="2" /> 196 195 <window_info anchor="bottom" id="Message" order="4" /> … … 205 204 <component name="XDebuggerManager"> 206 205 <breakpoint-manager> 207 <option name="time" value="4" /> 206 <breakpoints-dialog> 207 <breakpoints-dialog /> 208 </breakpoints-dialog> 209 <option name="time" value="13" /> 208 210 </breakpoint-manager> 209 211 </component> 210 212 <component name="editorHistoryManager"> 213 <entry file="file://$PROJECT_DIR$/src/Main.java"> 214 <provider selected="true" editor-type-id="text-editor"> 215 <state relative-caret-position="4890"> 216 <caret line="326" selection-start-line="326" selection-end-line="326" /> 217 <folding> 218 <element signature="imports" expanded="true" /> 219 <element signature="class#StartAndEndPoint#0;class#Main#0" /> 220 <element signature="method#removeDuplicates#0;class#Main#0" /> 221 <element signature="method#toBufferedImage#0;class#Main#0" /> 222 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 223 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 224 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 225 <element signature="e#7453#7462#0" expanded="true" /> 226 </folding> 227 </state> 228 </provider> 229 </entry> 211 230 <entry file="file://$PROJECT_DIR$/src/Main.java"> 212 231 <provider selected="true" editor-type-id="text-editor"> … … 217 236 <element signature="class#StartAndEndPoint#0;class#Main#0" /> 218 237 <element signature="method#removeDuplicates#0;class#Main#0" /> 219 <element signature="method#StandardDeviation#0;class#Main#0" /> 220 <element signature="method#toBufferedImage#0;class#Main#0" /> 221 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 222 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 223 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 224 <element signature="e#7430#7439#0" expanded="true" /> 238 <element signature="method#toBufferedImage#0;class#Main#0" /> 239 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 240 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 241 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 242 <element signature="e#7453#7462#0" expanded="true" /> 225 243 </folding> 226 244 </state> … … 235 253 <element signature="class#StartAndEndPoint#0;class#Main#0" /> 236 254 <element signature="method#removeDuplicates#0;class#Main#0" /> 237 <element signature="method#StandardDeviation#0;class#Main#0" /> 238 <element signature="method#toBufferedImage#0;class#Main#0" /> 239 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 240 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 241 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 242 <element signature="e#7430#7439#0" expanded="true" /> 255 <element signature="method#toBufferedImage#0;class#Main#0" /> 256 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 257 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 258 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 259 <element signature="e#7453#7462#0" expanded="true" /> 243 260 </folding> 244 261 </state> … … 253 270 <element signature="class#StartAndEndPoint#0;class#Main#0" /> 254 271 <element signature="method#removeDuplicates#0;class#Main#0" /> 255 <element signature="method#StandardDeviation#0;class#Main#0" /> 256 <element signature="method#toBufferedImage#0;class#Main#0" /> 257 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 258 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 259 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 260 <element signature="e#7430#7439#0" expanded="true" /> 272 <element signature="method#toBufferedImage#0;class#Main#0" /> 273 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 274 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 275 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 276 <element signature="e#7453#7462#0" expanded="true" /> 261 277 </folding> 262 278 </state> … … 271 287 <element signature="class#StartAndEndPoint#0;class#Main#0" /> 272 288 <element signature="method#removeDuplicates#0;class#Main#0" /> 273 <element signature="method#StandardDeviation#0;class#Main#0" /> 274 <element signature="method#toBufferedImage#0;class#Main#0" /> 275 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 276 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 277 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 278 <element signature="e#7430#7439#0" expanded="true" /> 289 <element signature="method#toBufferedImage#0;class#Main#0" /> 290 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 291 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 292 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 293 <element signature="e#7453#7462#0" expanded="true" /> 279 294 </folding> 280 295 </state> … … 289 304 <element signature="class#StartAndEndPoint#0;class#Main#0" /> 290 305 <element signature="method#removeDuplicates#0;class#Main#0" /> 291 <element signature="method#StandardDeviation#0;class#Main#0" /> 292 <element signature="method#toBufferedImage#0;class#Main#0" /> 293 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 294 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 295 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 296 <element signature="e#7430#7439#0" expanded="true" /> 306 <element signature="method#toBufferedImage#0;class#Main#0" /> 307 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 308 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 309 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 310 <element signature="e#7453#7462#0" expanded="true" /> 297 311 </folding> 298 312 </state> … … 307 321 <element signature="class#StartAndEndPoint#0;class#Main#0" /> 308 322 <element signature="method#removeDuplicates#0;class#Main#0" /> 309 <element signature="method#StandardDeviation#0;class#Main#0" /> 310 <element signature="method#toBufferedImage#0;class#Main#0" /> 311 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 312 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 313 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 314 <element signature="e#7430#7439#0" expanded="true" /> 323 <element signature="method#toBufferedImage#0;class#Main#0" /> 324 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 325 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 326 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 327 <element signature="e#7453#7462#0" expanded="true" /> 315 328 </folding> 316 329 </state> … … 325 338 <element signature="class#StartAndEndPoint#0;class#Main#0" /> 326 339 <element signature="method#removeDuplicates#0;class#Main#0" /> 327 <element signature="method#StandardDeviation#0;class#Main#0" /> 328 <element signature="method#toBufferedImage#0;class#Main#0" /> 329 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 330 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 331 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 332 <element signature="e#7430#7439#0" expanded="true" /> 340 <element signature="method#toBufferedImage#0;class#Main#0" /> 341 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 342 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 343 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 344 <element signature="e#7453#7462#0" expanded="true" /> 333 345 </folding> 334 346 </state> … … 343 355 <element signature="class#StartAndEndPoint#0;class#Main#0" /> 344 356 <element signature="method#removeDuplicates#0;class#Main#0" /> 345 <element signature="method#StandardDeviation#0;class#Main#0" /> 346 <element signature="method#toBufferedImage#0;class#Main#0" /> 347 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 348 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 349 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 350 <element signature="e#7430#7439#0" expanded="true" /> 357 <element signature="method#toBufferedImage#0;class#Main#0" /> 358 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 359 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 360 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 361 <element signature="e#7453#7462#0" expanded="true" /> 351 362 </folding> 352 363 </state> … … 361 372 <element signature="class#StartAndEndPoint#0;class#Main#0" /> 362 373 <element signature="method#removeDuplicates#0;class#Main#0" /> 363 <element signature="method#StandardDeviation#0;class#Main#0" /> 364 <element signature="method#toBufferedImage#0;class#Main#0" /> 365 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 366 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 367 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 368 <element signature="e#7430#7439#0" expanded="true" /> 374 <element signature="method#toBufferedImage#0;class#Main#0" /> 375 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 376 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 377 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 378 <element signature="e#7453#7462#0" expanded="true" /> 369 379 </folding> 370 380 </state> … … 379 389 <element signature="class#StartAndEndPoint#0;class#Main#0" /> 380 390 <element signature="method#removeDuplicates#0;class#Main#0" /> 381 <element signature="method#StandardDeviation#0;class#Main#0" /> 382 <element signature="method#toBufferedImage#0;class#Main#0" /> 383 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 384 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 385 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 386 <element signature="e#7430#7439#0" expanded="true" /> 391 <element signature="method#toBufferedImage#0;class#Main#0" /> 392 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 393 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 394 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 395 <element signature="e#7453#7462#0" expanded="true" /> 387 396 </folding> 388 397 </state> … … 397 406 <element signature="class#StartAndEndPoint#0;class#Main#0" /> 398 407 <element signature="method#removeDuplicates#0;class#Main#0" /> 399 <element signature="method#StandardDeviation#0;class#Main#0" /> 400 <element signature="method#toBufferedImage#0;class#Main#0" /> 401 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 402 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 403 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 404 <element signature="e#7430#7439#0" expanded="true" /> 408 <element signature="method#toBufferedImage#0;class#Main#0" /> 409 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 410 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 411 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 412 <element signature="e#7453#7462#0" expanded="true" /> 405 413 </folding> 406 414 </state> … … 415 423 <element signature="class#StartAndEndPoint#0;class#Main#0" /> 416 424 <element signature="method#removeDuplicates#0;class#Main#0" /> 417 <element signature="method#StandardDeviation#0;class#Main#0" /> 418 <element signature="method#toBufferedImage#0;class#Main#0" /> 419 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 420 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 421 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 422 <element signature="e#7430#7439#0" expanded="true" /> 425 <element signature="method#toBufferedImage#0;class#Main#0" /> 426 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 427 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 428 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 429 <element signature="e#7453#7462#0" expanded="true" /> 423 430 </folding> 424 431 </state> … … 433 440 <element signature="class#StartAndEndPoint#0;class#Main#0" /> 434 441 <element signature="method#removeDuplicates#0;class#Main#0" /> 435 <element signature="method#StandardDeviation#0;class#Main#0" /> 436 <element signature="method#toBufferedImage#0;class#Main#0" /> 437 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 438 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 439 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 440 <element signature="e#7430#7439#0" expanded="true" /> 442 <element signature="method#toBufferedImage#0;class#Main#0" /> 443 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 444 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 445 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 446 <element signature="e#7453#7462#0" expanded="true" /> 441 447 </folding> 442 448 </state> … … 451 457 <element signature="class#StartAndEndPoint#0;class#Main#0" /> 452 458 <element signature="method#removeDuplicates#0;class#Main#0" /> 453 <element signature="method#StandardDeviation#0;class#Main#0" /> 454 <element signature="method#toBufferedImage#0;class#Main#0" /> 455 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 456 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 457 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 458 <element signature="e#7430#7439#0" expanded="true" /> 459 <element signature="method#toBufferedImage#0;class#Main#0" /> 460 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 461 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 462 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 463 <element signature="e#7453#7462#0" expanded="true" /> 459 464 </folding> 460 465 </state> … … 469 474 <element signature="class#StartAndEndPoint#0;class#Main#0" /> 470 475 <element signature="method#removeDuplicates#0;class#Main#0" /> 471 <element signature="method#StandardDeviation#0;class#Main#0" /> 472 <element signature="method#toBufferedImage#0;class#Main#0" /> 473 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 474 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 475 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 476 <element signature="e#7430#7439#0" expanded="true" /> 476 <element signature="method#toBufferedImage#0;class#Main#0" /> 477 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 478 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 479 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 480 <element signature="e#7453#7462#0" expanded="true" /> 477 481 </folding> 478 482 </state> … … 487 491 <element signature="class#StartAndEndPoint#0;class#Main#0" /> 488 492 <element signature="method#removeDuplicates#0;class#Main#0" /> 489 <element signature="method#StandardDeviation#0;class#Main#0" /> 490 <element signature="method#toBufferedImage#0;class#Main#0" /> 491 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 492 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 493 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 494 <element signature="e#7430#7439#0" expanded="true" /> 493 <element signature="method#toBufferedImage#0;class#Main#0" /> 494 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 495 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 496 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 497 <element signature="e#7453#7462#0" expanded="true" /> 495 498 </folding> 496 499 </state> … … 505 508 <element signature="class#StartAndEndPoint#0;class#Main#0" /> 506 509 <element signature="method#removeDuplicates#0;class#Main#0" /> 507 <element signature="method#StandardDeviation#0;class#Main#0" /> 508 <element signature="method#toBufferedImage#0;class#Main#0" /> 509 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 510 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 511 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 512 <element signature="e#7430#7439#0" expanded="true" /> 510 <element signature="method#toBufferedImage#0;class#Main#0" /> 511 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 512 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 513 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 514 <element signature="e#7453#7462#0" expanded="true" /> 513 515 </folding> 514 516 </state> … … 523 525 <element signature="class#StartAndEndPoint#0;class#Main#0" /> 524 526 <element signature="method#removeDuplicates#0;class#Main#0" /> 525 <element signature="method#StandardDeviation#0;class#Main#0" /> 526 <element signature="method#toBufferedImage#0;class#Main#0" /> 527 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 528 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 529 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 530 <element signature="e#7430#7439#0" expanded="true" /> 527 <element signature="method#toBufferedImage#0;class#Main#0" /> 528 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 529 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 530 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 531 <element signature="e#7453#7462#0" expanded="true" /> 531 532 </folding> 532 533 </state> … … 541 542 <element signature="class#StartAndEndPoint#0;class#Main#0" /> 542 543 <element signature="method#removeDuplicates#0;class#Main#0" /> 543 <element signature="method#StandardDeviation#0;class#Main#0" /> 544 <element signature="method#toBufferedImage#0;class#Main#0" /> 545 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 546 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 547 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 548 <element signature="e#7430#7439#0" expanded="true" /> 544 <element signature="method#toBufferedImage#0;class#Main#0" /> 545 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 546 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 547 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 548 <element signature="e#7453#7462#0" expanded="true" /> 549 549 </folding> 550 550 </state> … … 559 559 <element signature="class#StartAndEndPoint#0;class#Main#0" /> 560 560 <element signature="method#removeDuplicates#0;class#Main#0" /> 561 <element signature="method#StandardDeviation#0;class#Main#0" /> 562 <element signature="method#toBufferedImage#0;class#Main#0" /> 563 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 564 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 565 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 566 <element signature="e#7430#7439#0" expanded="true" /> 561 <element signature="method#toBufferedImage#0;class#Main#0" /> 562 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 563 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 564 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 565 <element signature="e#7453#7462#0" expanded="true" /> 567 566 </folding> 568 567 </state> … … 577 576 <element signature="class#StartAndEndPoint#0;class#Main#0" /> 578 577 <element signature="method#removeDuplicates#0;class#Main#0" /> 579 <element signature="method#StandardDeviation#0;class#Main#0" /> 580 <element signature="method#toBufferedImage#0;class#Main#0" /> 581 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 582 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 583 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 584 <element signature="e#7430#7439#0" expanded="true" /> 578 <element signature="method#toBufferedImage#0;class#Main#0" /> 579 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 580 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 581 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 582 <element signature="e#7453#7462#0" expanded="true" /> 585 583 </folding> 586 584 </state> … … 595 593 <element signature="class#StartAndEndPoint#0;class#Main#0" /> 596 594 <element signature="method#removeDuplicates#0;class#Main#0" /> 597 <element signature="method#StandardDeviation#0;class#Main#0" /> 598 <element signature="method#toBufferedImage#0;class#Main#0" /> 599 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 600 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 601 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 602 <element signature="e#7430#7439#0" expanded="true" /> 595 <element signature="method#toBufferedImage#0;class#Main#0" /> 596 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 597 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 598 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 599 <element signature="e#7453#7462#0" expanded="true" /> 603 600 </folding> 604 601 </state> … … 613 610 <element signature="class#StartAndEndPoint#0;class#Main#0" /> 614 611 <element signature="method#removeDuplicates#0;class#Main#0" /> 615 <element signature="method#StandardDeviation#0;class#Main#0" /> 616 <element signature="method#toBufferedImage#0;class#Main#0" /> 617 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 618 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 619 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 620 <element signature="e#7430#7439#0" expanded="true" /> 612 <element signature="method#toBufferedImage#0;class#Main#0" /> 613 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 614 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 615 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 616 <element signature="e#7453#7462#0" expanded="true" /> 621 617 </folding> 622 618 </state> … … 631 627 <element signature="class#StartAndEndPoint#0;class#Main#0" /> 632 628 <element signature="method#removeDuplicates#0;class#Main#0" /> 633 <element signature="method#StandardDeviation#0;class#Main#0" /> 634 <element signature="method#toBufferedImage#0;class#Main#0" /> 635 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 636 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 637 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 638 <element signature="e#7430#7439#0" expanded="true" /> 629 <element signature="method#toBufferedImage#0;class#Main#0" /> 630 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 631 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 632 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 633 <element signature="e#7453#7462#0" expanded="true" /> 639 634 </folding> 640 635 </state> … … 649 644 <element signature="class#StartAndEndPoint#0;class#Main#0" /> 650 645 <element signature="method#removeDuplicates#0;class#Main#0" /> 651 <element signature="method#StandardDeviation#0;class#Main#0" /> 652 <element signature="method#toBufferedImage#0;class#Main#0" /> 653 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 654 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 655 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 656 <element signature="e#7430#7439#0" expanded="true" /> 646 <element signature="method#toBufferedImage#0;class#Main#0" /> 647 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 648 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 649 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 650 <element signature="e#7453#7462#0" expanded="true" /> 657 651 </folding> 658 652 </state> … … 667 661 <element signature="class#StartAndEndPoint#0;class#Main#0" /> 668 662 <element signature="method#removeDuplicates#0;class#Main#0" /> 669 <element signature="method#StandardDeviation#0;class#Main#0" /> 670 <element signature="method#toBufferedImage#0;class#Main#0" /> 671 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 672 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 673 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 674 <element signature="e#7430#7439#0" expanded="true" /> 663 <element signature="method#toBufferedImage#0;class#Main#0" /> 664 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 665 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 666 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 667 <element signature="e#7453#7462#0" expanded="true" /> 675 668 </folding> 676 669 </state> … … 685 678 <element signature="class#StartAndEndPoint#0;class#Main#0" /> 686 679 <element signature="method#removeDuplicates#0;class#Main#0" /> 687 <element signature="method#StandardDeviation#0;class#Main#0" /> 688 <element signature="method#toBufferedImage#0;class#Main#0" /> 689 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 690 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 691 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 692 <element signature="e#7430#7439#0" expanded="true" /> 680 <element signature="method#toBufferedImage#0;class#Main#0" /> 681 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 682 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 683 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 684 <element signature="e#7453#7462#0" expanded="true" /> 693 685 </folding> 694 686 </state> … … 715 707 <entry file="file://$PROJECT_DIR$/src/Main.java"> 716 708 <provider selected="true" editor-type-id="text-editor"> 717 <state relative-caret-position="801"> 718 <caret line="326" selection-start-line="326" selection-end-line="326" /> 719 <folding> 720 <element signature="imports" expanded="true" /> 721 <element signature="class#StartAndEndPoint#0;class#Main#0" /> 722 <element signature="method#removeDuplicates#0;class#Main#0" /> 723 <element signature="method#StandardDeviation#0;class#Main#0" /> 724 <element signature="method#toBufferedImage#0;class#Main#0" /> 725 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 726 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 727 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 728 <element signature="e#7430#7439#0" expanded="true" /> 709 <state relative-caret-position="506"> 710 <caret line="504" column="30" selection-start-line="504" selection-start-column="30" selection-end-line="504" selection-end-column="30" /> 711 <folding> 712 <element signature="imports" expanded="true" /> 713 <element signature="class#StartAndEndPoint#0;class#Main#0" /> 714 <element signature="method#removeDuplicates#0;class#Main#0" /> 715 <element signature="method#toBufferedImage#0;class#Main#0" /> 716 <element signature="method#ClassifierPixelCount#0;class#Main#0" /> 717 <element signature="method#ClassifierLineCount#0;class#Main#0" /> 718 <element signature="method#ClassifierLineClusterOLD#0;class#Main#0" /> 719 <element signature="e#7453#7462#0" expanded="true" /> 729 720 </folding> 730 721 </state> -
other-projects/is-sheet-music-encore/trunk/image-identification-development/src/Main.java
r33304 r33310 103 103 public static double StandardDeviation(double parseArray[]) 104 104 { 105 105 106 double mean; 106 double sum =0 ;107 double standardDeviation = 0 ;107 double sum =0.0; 108 double standardDeviation = 0.0; 108 109 //calculate sum of array 109 for(int i =0; i >parseArray.length; i++){110 for(int i =0; i < parseArray.length; i++){ 110 111 sum += parseArray[i]; 111 112 } … … 113 114 mean = sum/parseArray.length; 114 115 //calculate SD of array 115 for(int j =0; j >parseArray.length; j++){116 for(int j =0; j < parseArray.length; j++){ 116 117 standardDeviation += Math.pow(parseArray[j]-mean, 2); 117 118 } 118 119 return Math.sqrt(standardDeviation/parseArray.length); 120 121 119 122 } 120 123 … … 123 126 static int CLASSIFIER_HOUGHLINESP_MAX = 65; 124 127 static int HOUGHLINEP_THRESHOLD = 10; 128 static int STANDARD_DEVIATION_THRESHOLD = 6; 125 129 static int MINLINECOUNT = 40; 126 130 static double MAXLINEGAP = 1; //4 … … 210 214 ArrayList<Integer> redPixelYpos = new ArrayList<Integer>(); 211 215 212 213 214 216 //Go Thru every pixel 215 217 for(int i=0; i < y; i++){ … … 260 262 return returnArray; 261 263 } 262 263 private static ArrayList ClassifierLineCluster(ArrayList<StartAndEndPoint> linePointsArray){ 264 private static ArrayList ClassifierLineCluster(ArrayList<StartAndEndPoint> linePointsArray, Mat clustersFoundRGB){ 265 266 /* 267 This will check for a cluster of lines that are close together. 268 1. Go through the list of Y positions(start point) in parsed array. 269 If, there is a small distance between them, 270 then, add to closeLineArray. 271 272 Have all Y positions that are close to each other now. 273 Need to find the lines that are clustered together. 274 275 Now check if there are four of these are close to each other. 276 2. Go through list of closeLine. 277 Get first four lines, traversing down a step each iteration {0,1,2,3} -> {1,2,3,4} -> {2,3,4,5} 278 If, those 4 lines are close together, 279 Then, add them to a new array that holds Line Cluster Values. 280 Go to line 4 positions down since, as do not want duplicates. 281 282 3. 283 */ 284 264 285 ArrayList returnArray = new ArrayList(); 265 286 ArrayList<Double> closeLineYPos = new ArrayList(); … … 269 290 if(linePointsArray.size()> 1) { 270 291 292 /* 271 293 //Display input array TESTING PURPOSES 272 294 for (int i = 0; i < linePointsArray.size(); i++) { 273 295 System.out.println(linePointsArray.get(i).toString()); 274 296 } 275 276 277 // Check if y points are close together297 */ 298 299 //1. Check if y points are close together 278 300 //go thru list and compare values against each other 279 301 for (int i = 0; i < linePointsArray.size(); i++){ … … 289 311 } 290 312 } 291 292 System.out.println(" "); 293 294 //Have all y coordinates that close to each other. 295 //Now check if there are four of these are close to each other. 313 /*for (double num : closeLineYPos){ 314 System.out.println(num); 315 } */ 316 317 //2. Now check if there are four of these are close to each other. 318 //Go through all of the items in this list and check if four of them are close together 319 //Check first four items, traverse down a step {0,1,2,3} -> {1,2,3,4} -> {2,3,4,5} 320 //If 4 items are close together, 321 //Then add them to a new array that holds Line Cluster Values. 322 //Go down 4 positions down since, as do not want duplicates. 323 324 //Now have an array of at least four lines that are close together. 325 //Sort array and remove duplicates 326 Collections.sort(closeLineYPos); 327 closeLineYPos = removeDuplicates(closeLineYPos); 296 328 if(closeLineYPos.size() >= 4) { 297 //Sort array and remove duplicates 298 Collections.sort(closeLineYPos); 299 closeLineYPos = removeDuplicates(closeLineYPos); 300 301 302 /*for (double num : closeLineYPos){ 303 System.out.println(num); 304 } */ 305 306 307 //Check first four items, traverse down a step {0,1,2,3} -> {1,2,3,4} -> {2,3,4,5} 329 //FOR every item in array of CloseLines 308 330 for(int i= 0; i< closeLineYPos.size(); i++){ 309 //If last comparator is within the array bounds.310 if(i + 3 == closeLineYPos.size()){331 //If last comparator is at end of array. 332 if(i + 4 >= closeLineYPos.size()){ 311 333 break; 312 334 } 313 335 else{ 336 //Add 4 values of Close Line Array to a tempArray 314 337 double[] tempArray = new double[4]; 315 tempArray[0] = closeLineYPos.get(i + 0);338 tempArray[0] = closeLineYPos.get(i); 316 339 tempArray[1] = closeLineYPos.get(i + 1); 317 340 tempArray[2] = closeLineYPos.get(i + 2); 318 341 tempArray[3] = closeLineYPos.get(i + 3); 319 System.out.println(tempArray[0] + " , " + tempArray[1] + " , " + tempArray[2] + " , " + tempArray[3]); 320 //Check standard deviation 321 if(StandardDeviation(tempArray) < 5){ 342 343 //Check standard deviation between these 4 values. 344 //If it SD is less than 5 then it is considered to be a cluster of lines. 345 346 if(StandardDeviation(tempArray) < STANDARD_DEVIATION_THRESHOLD){ 347 System.out.println("tempArray PT: "+tempArray[0] + " , " + tempArray[1] + " , " + tempArray[2] + " , " + tempArray[3]); 348 System.out.println("tempArray SD: " + StandardDeviation(tempArray)); 322 349 //Store array 323 350 clusterArray.add(tempArray); 324 //Check if more than one item in array 325 if(clusterArray.size() > 1){ 326 //check for duplicate yPos in stored arrays (tempArray) 327 351 //If I + 4 is less than the size of the array then increment by 4 352 //Go down +4 positions in closeLineYPos array 353 if((i + 4 < closeLineYPos.size())){ 354 System.out.println("IF, i = " + i + " -> "+ (i+4) + ", CloseLineYpos size= " + closeLineYPos.size()); 355 i = i+4; 328 356 } 329 330 357 else{ 358 //break 359 System.out.println("ELSE, i = " + i+ " closeLineYpos size= " + closeLineYPos.size()); 360 Thread.sleep(2000); 361 break; 362 } 331 363 } 332 364 } 333 365 } 334 335 //for (double num : closeLineYPos){ 336 // System.out.println(num); 337 //} 338 } 339 340 //PROBLEM. Definition of cluster. Need to check if cluster. 341 //check if four lines are close to each other.(four for loops) 342 // then store these four items in an array and add one to the counter. 343 // (will need to check if found 5th item. - DONT NEED TO? Value gained from finding the 5th line? The staffline height?) 344 // 345 346 347 366 } 367 /* 368 System.out.println("Cluster Coordinates: "); 369 for(double[] items : clusterArray){ 370 for(int i = 0; i <items.length; i++){ 371 System.out.println("ITEMS: "+ items[i]); 372 } 373 } 374 */ 375 //Setup Drawing clusters found. 376 //For every pt given the input array 377 for(StartAndEndPoint pt : linePointsArray){ 378 //Go through every the Arrays in the clusterArray(clustered lines) 379 for(int i =0; i < clusterArray.size(); i++){ 380 //Go through every item in the array 381 for(double item : clusterArray.get(i)) { 382 //Check if the curr item is equal to current pt 383 if (item == pt.getP1().y){ 384 //calculate a different colour for each line 385 386 //Draw a line 387 Imgproc.line(clustersFoundRGB, pt.getP1(), pt.getP2(), new Scalar(0, 255, 0), 1, Imgproc.LINE_4, 0); 388 } 389 } 390 } 391 392 } 393 394 clusterCount = clusterArray.size(); 348 395 //SETUP RETURN ARRAY 349 if(cl oseLineYPos.size() >= 4){396 if(clusterCount >= 1){ 350 397 returnArray.add(true); 351 398 returnArray.add(closeLineYPos.size()); 352 399 returnArray.add(clusterCount); 400 returnArray.add(clustersFoundRGB); 353 401 } 354 402 else{ … … 377 425 Mat edgesDetected = new Mat(); 378 426 Mat edgesDetectedRGB = new Mat(); 427 Mat clustersFoundRGB = new Mat(); 379 428 String directory = "/Scratch/cpb16/is-sheet-music-encore/download-images/MU/"; 380 429 //!!!!!!!!!!!!!!!!!!!!!!!!!!!NOT!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 381 430 //mdp.39015097852365-2.png 176 lines Contents page. 382 431 //mdp.39015097852555-3.png 76 lines 383 String default_file = directory+"SheetMusic/coo.31924062612282-9.png";432 //String default_file = directory+"SheetMusic/coo.31924062612282-9.png"; 384 433 //String default_file ="TestImages/NotNot/mdp.39015080972303-3.png"; 385 434 … … 389 438 //String default_file = "TestImages/NotSheetMusic02.png"; 390 439 //String default_file = "TestImages/SheetMusic01.png"; 391 //String default_file = "TestImages/SheetMusic02.png";440 String default_file = "TestImages/SheetMusic02.png"; 392 441 //String default_file = "TestImages/vLine.png"; 393 442 String filename = ((args.length > 0) ? args[0] : default_file); … … 404 453 //Convert to RGB for future use 405 454 Imgproc.cvtColor(edgesDetected, edgesDetectedRGB, Imgproc.COLOR_GRAY2BGR); 455 clustersFoundRGB = edgesDetectedRGB.clone(); 406 456 407 457 Mat linesP = new Mat(); // will hold the results of the detection … … 434 484 BufferedImage toBeClassifiedImg = toBufferedImage(edgesDetectedRGB); 435 485 436 System.out.println("LINE COUNT RESULT: " + ClassifierLineCount(horizontalLineCount) + '\t' +"LineCount: " + horizontalLineCount); //COUNT OF LINES CLASSIFICATION 437 System.out.println("LINE CLUSTER RESULT: " + ClassifierLineClusterOLD(toBeClassifiedImg).get(0) + '\t' + "LinesFound: " + ClassifierLineClusterOLD(toBeClassifiedImg).get(1) + '\t' + "ClustersFound: " + ClassifierLineClusterOLD(toBeClassifiedImg).get(2)); 438 //System.out.println("NEW CLUSTER RESULTS: " + ClassifierLineCluster(pointArrayList).get(0) + '\t' + "LinesFound: " + ClassifierLineCluster(pointArrayList).get(1) + '\t' + "ClustersFound: " + ClassifierLineCluster(pointArrayList).get(2)); 439 System.out.println(ClassifierLineCluster(pointArrayList)); 486 440 487 441 488 //Display Results … … 443 490 //HighGui.imshow("Just Edges", justEdges); //TESTING 444 491 HighGui.imshow("Detected Lines (in red) - positive", edgesDetectedRGB); 492 if(ClassifierLineCluster(pointArrayList, clustersFoundRGB).get(3) != null) { 493 HighGui.imshow("CLUSTERS FOUND", clustersFoundRGB); 494 } 445 495 //HighGui.imshow("Detected Lines (in red) - negative", edgesDetectedRGBProb); 446 //HighGui.imshow("Detected Lines (in red) - edgeDoesntMakeSense", edgeDoesntMakeSense); 496 497 498 499 //System.out.println("LINE COUNT RESULT: " + ClassifierLineCount(horizontalLineCount) + '\t' +"LineCount: " + horizontalLineCount); //COUNT OF LINES CLASSIFICATION 500 //System.out.println("LINE CLUSTER RESULT: " + ClassifierLineClusterOLD(toBeClassifiedImg).get(0) + '\t' + "LinesFound: " + ClassifierLineClusterOLD(toBeClassifiedImg).get(1) + '\t' + "ClustersFound: " + ClassifierLineClusterOLD(toBeClassifiedImg).get(2)); 501 System.out.println("NEW CLUSTER RESULTS: " + ClassifierLineCluster(pointArrayList,clustersFoundRGB).get(0) + '\t' + "LinesFound: " + ClassifierLineCluster(pointArrayList,clustersFoundRGB).get(1) + '\t' + "ClustersFound: " + ClassifierLineCluster(pointArrayList,clustersFoundRGB).get(2)); 502 //System.out.println(ClassifierLineCluster(pointArrayList, clustersFoundRGB)); 447 503 448 504 // Wait and Exit
Note:
See TracChangeset
for help on using the changeset viewer.