Mercurial > hg > match-vamp

comparison src/Finder.cpp @ 73:7e3c1bc0984a refactors

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tidy
author Chris Cannam
date Wed, 19 Nov 2014 10:48:27 +0000
parents c3c50d5e05b7
children e1a5f3095ba6 e8ab30f90e53
comparison
equal deleted inserted replaced
72:c3c50d5e05b7 73:7e3c1bc0984a
77 bestCol = index; 77 bestCol = index;
78 bestRow = row; 78 bestRow = row;
79 } 79 }
80 } 80 }
81 81
82 // System.err.print(" BEST: " + bestRow + " " + bestCol + " " + check);
83 // System.err.println(" " + pm1->frameCount + " " + pm2->frameCount);
84 /*
85 if (check) {
86 // System.err.println(find(row+1, col) + " " + find(row, col+1));
87 if (!find(row, col+1)) {
88 return Matcher::AdvanceThis;
89 } else if (!find(row+1, col)) {
90 return Matcher::AdvanceOther;
91 }
92 }
93 */
94
95 if (bestRow == row) { 82 if (bestRow == row) {
96 if (bestCol == col) { 83 if (bestCol == col) {
97 return Matcher::AdvanceBoth; 84 return Matcher::AdvanceBoth;
98 } else { 85 } else {
99 return Matcher::AdvanceThis; 86 return Matcher::AdvanceThis;
102 return Matcher::AdvanceOther; 89 return Matcher::AdvanceOther;
103 } else { 90 } else {
104 return Matcher::AdvanceNone; 91 return Matcher::AdvanceNone;
105 } 92 }
106 93
107 } // getExpandDirection() 94 }
108 95
109 void 96 void
110 Finder::recalculatePathCostMatrix(int r1, int c1, int r2, int c2) 97 Finder::recalculatePathCostMatrix(int r1, int c1, int r2, int c2)
111 { 98 {
112 int prevRowStart = 0, prevRowStop = 0; 99 int prevRowStart = 0, prevRowStop = 0;