Mercurial > hg > semantic-sia
changeset 15:b43260af3de6
removed commented-out code and debug-related comments
author | stevenh |
---|---|
date | Tue, 08 Jan 2013 18:22:26 +0000 |
parents | eb086fc26803 |
children | 6863887e1b70 |
files | src/org/qmul/eecs/c4dm/sia/SiaTecMain.java |
diffstat | 1 files changed, 7 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/src/org/qmul/eecs/c4dm/sia/SiaTecMain.java Tue Jan 08 18:18:52 2013 +0000 +++ b/src/org/qmul/eecs/c4dm/sia/SiaTecMain.java Tue Jan 08 18:22:26 2013 +0000 @@ -142,24 +142,17 @@ // Display results using algorithm figures 23, 24 and 25 of the research paper int r = y.size(); m = vteListV.size(); - i = 0; // *** check indexing + i = 0; System.out.println(); System.out.print("{"); - if (r > 0) // *** check indexing + if (r > 0) { do { - int j = y.get(i).getI() - 1; // *** check indexing + int j = y.get(i).getI() - 1; List<Integer> iList = new ArrayList<Integer>(); - while (j < m && (vteListV.get(j).getVector().compareTo(vteListV.get(y.get(i).getI() - 1).getVector()) == 0)) // *** check indexing + while (j < m && (vteListV.get(j).getVector().compareTo(vteListV.get(y.get(i).getI() - 1).getVector()) == 0)) { -// // debug start -// for (int hundip = 0; hundip < vteList.size(); hundip++) -// { -// System.out.println("v[" + hundip + ",2] = " + vteList.get(hundip).getFromDatapoint().getOrderedIndex()); -// } -// // debug start - iList.add(vteListV.get(j).getFromDatapoint().getOrderedIndex()); j++; } @@ -171,14 +164,14 @@ do { i++; - } while (i < r && (y.get(i).compareToIgnoreI(y.get(i - 1)) == 0)); // *** check indexing + } while (i < r && (y.get(i).compareToIgnoreI(y.get(i - 1)) == 0)); - if (i < r) // *** check indexing + if (i < r) { System.out.print(","); System.out.println(); } - } while (i < r); // *** check indexing + } while (i < r); } System.out.println("}"); @@ -236,17 +229,6 @@ if (p == 1) { -// // debug start -// for (int f = 0; f < vectorTableW.size(); f++) -// { -// try { -// System.out.println("W[" + f + "] = <<" + vectorTableW.getVteList().get(f).getDimensionValue(1) + "," + vectorTableW.getVteList().get(f).getDimensionValue(2) + ">," + vectorTableW.getVteList().get(f).getFromDatapoint().getOrderedIndex() + ">"); -// } catch (DimensionException e) { -// // TODO Auto-generated catch block -// e.printStackTrace(); -// } -// } -// // debug end System.out.print("{"); Display.printVector(vectorTableW.getVector(iList.get(0), 1)); for (int k = 2; k <= n; k++)