It's done

TomLisankie · Mar 5, 2017 · 7622fa3 · 7622fa3
1 parent a464725
commit 7622fa3
Show file tree

Hide file tree

Showing 12 changed files with 4 additions and 611 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/src/.DS_Store b/src/.DS_Store
diff --git a/src/com/.DS_Store b/src/com/.DS_Store
diff --git a/src/com/shakenearth/rhyme_essentials/CartesianProduct.java b/src/com/shakenearth/rhyme_essentials/CartesianProduct.java
@@ -11,8 +11,6 @@ public CartesianProduct(Word word1, Word word2){ //builds a new Cartesian produc
 		Word shorterWord = null;
 		Word longerWord = null;
 
-		System.out.println("Cartesian Product of Newest Method: \n");
-
 		//these conditionals find which word is longer and which is shorter
 		if(word1.getListOfPhonemes().size() < word2.getListOfPhonemes().size()){
 
@@ -36,33 +34,12 @@ public CartesianProduct(Word word1, Word word2){ //builds a new Cartesian produc
 				OrderedPair newOrderedPair = new OrderedPair(shorterWord.getListOfPhonemes().get(s), longerWord.getListOfPhonemes().get(l), l);
 				currentRow.add(newOrderedPair);
 
-				//print the Ordered Pairs and make it look pretty
-
-				if(newOrderedPair.getShorterWordPhoneme().length()  == 2 && newOrderedPair.getLongerWordPhoneme().length()  == 2){
-
-					System.out.print(newOrderedPair + "  ");
-
-				}else if(newOrderedPair.getShorterWordPhoneme().length()  != newOrderedPair.getLongerWordPhoneme().length()){
-
-					System.out.print(newOrderedPair + "   ");
-
-				}else if(newOrderedPair.getShorterWordPhoneme().length()  == 1 && newOrderedPair.getLongerWordPhoneme().length()  == 1){
-
-					System.out.print(newOrderedPair + "    ");
-
-				}
-
-				//End print of ordered pairs
-
 			}
 
-			System.out.println();
 			cartesianProductMatrix.add(currentRow);
 
 		}
 
-		System.out.println();
-
 	}
 
 	public void resetOrderedPairRVs(){

diff --git a/src/com/shakenearth/rhyme_essentials/Layer.java b/src/com/shakenearth/rhyme_essentials/Layer.java
diff --git a/src/com/shakenearth/rhyme_essentials/Node.java b/src/com/shakenearth/rhyme_essentials/Node.java
diff --git a/src/com/shakenearth/rhyme_essentials/OrderedPair.java b/src/com/shakenearth/rhyme_essentials/OrderedPair.java
@@ -155,7 +155,6 @@ public void setIndexes(ArrayList<Integer> indexes) {
 	public void calculateGapPenalty(int lSize) {
 
 		double deduction = 0.0;
-		System.out.println("INDEXES: " + getIndexes());
 
 		for(int i = 0; i < getIndexes().size() - 1; i++){
 
@@ -186,9 +185,6 @@ public void calculateGapPenalty(int lSize) {
 
 		}
 
-		System.out.println("NEW DEDUCTION: " + deduction);
-		System.out.println("RV BEFORE DEDUCTION: " + getRhymeValue());
-
 		setRhymeValue(getRhymeValue() - deduction);
 
 	}

diff --git a/src/com/shakenearth/rhyme_essentials/PhonemeSequence.java b/src/com/shakenearth/rhyme_essentials/PhonemeSequence.java
diff --git a/src/com/shakenearth/rhyme_essentials/Point2DCompare.java b/src/com/shakenearth/rhyme_essentials/Point2DCompare.java