Merge pull request #13 from rdubrock/master

Added deep copy to duple finder

Author: apinfodesign

sudoku.js

@@ -8,11 +8,12 @@ var checkBlock = require('./checkBlock.js');
 var printer = require('./boardprinter.js');
 var boardString = "8  2    5  97    4 25 1  9 2    7   96 3 1 52   6    1 8  4 73 7    65  3    8  9"
 var boardArray = boardString.split('');
- 
- var cycleCount = 0;
-var cycleCountLimit = 20;
+
+var cycleCount = 0;
+var cycleCountLimit = 50;
 var masterCycleCount = 0;
-var masterCycleCountLimit = 200;
+var masterCycleCountLimit = 1000;
+
 var arrayDepot = [];
 var arrayDepotIndex = 0;
 
@@ -31,8 +32,9 @@ function findOptions(fullArray){
 	var solvedSquares = 0;
 	masterCycleCount = masterCycleCount + 1;
 	if (masterCycleCount >= masterCycleCountLimit){
-					return console.log('Master Cycle Limit Exceeded');
-	}
+					console.log('Master Cycle Limit Exceeded');
+
+					return 	}
 	for (row=0; row<9; row++) {
 		for (col=0; col<9; col++) {					
 				if (fullArray[row][col].value === null) {
@@ -68,81 +70,11 @@ function insertSingletonValue(fullArray){
 	if (cycleCount === cycleCountLimit) {
 		cycleCount = 0;
 		console.log('calling findOptions from arrayDepot')
-
 		arrayDepotIndex = arrayDepotIndex + 1;
-		var arrayToPass = arrayDepotIndex - 1;
-		buildPrinterString(arrayDepot[arrayToPass]);
-		findOptions(arrayDepot[arrayToPass]);
-		return;
-		
-		
-	};
-	
-	for (row=0; row<9; row++) {
-		for (col=0; col<9; col++) {
-			if (fullArray[row][col].possibles.length === 1 && fullArray[row][col].value === null) {
-				possibleLengths = 1;
-				fullArray[row][col].value = fullArray[row][col].possibles[0];
-				console.log('Singleton assigned at: ' + (col + 1) + ', ' + (9-row));
-				console.log('Block is: ' + fullArray[row][col].block);
-				console.log('Possibles Array for location is ' + fullArray[row][col].possibles[0]);
-				buildPrinterString(fullArray);
-
-
-				//after finding ONE singleton, display something
-				if (possibleLengths === 0) {
-					console.log('NO NEW POSSIBLES ARRAYS WITH A LENGTH OF 1');
-					buildPrinterString(fullArray);
-					insertDupleValues(fullArray);
-				}
-
-				//after finding ONE singleton, find new options
-				console.log("Calling findOptions after one singleton possibles added.")
-				findOptions(fullArray);
 
+		buildPrinterString(arrayDepot[0]);
+		findOptions(arrayDepot.shift());
 
-			}
-		//solve for possibles array length of 2	
-		else if (fullArray[row][col].possibles.length === 2 && fullArray[row][col].value === null) {
-			
-			//insert the first value of the 2 possibles
-			fullArray[row][col].value = fullArray[row][col].possibles[0];
-				console.log('Possibles=Two - Solving for Position Zero '); 
-				console.log('Singleton assigned at: ' + (col + 1) + ', ' + (9-row));
-				console.log('Block is: ' + fullArray[row][col].block);
-				console.log('Possibles Array for location is ' + fullArray[row][col].possibles[0] + 
-								" and " + fullArray[row][col].possibles[1] );
-				buildPrinterString(fullArray);
-
-				console.log("Calling findOptions after one singleton possibles added.")
-				findOptions(fullArray);
-			}
-
-
-		}
-	}
-
-
-};
-
-
-//inserts all singleton values prior to recalculation?
-function insertSingletonValues(fullArray){
-	var possibleLengths = 0;
-	var row, col;
-	cycleCount = cycleCount +1;
-	
-	if (cycleCount === cycleCountLimit) {
-		cycleCount = 0;
-		console.log('calling findOptions from arrayDepot')
-
-		arrayDepotIndex = arrayDepotIndex + 1;
-		var arrayToPass = arrayDepotIndex - 1;
-		buildPrinterString(arrayDepot[arrayToPass]);
-		findOptions(arrayDepot[arrayToPass]);
-		return;
-		
-		
 	};
 
 	for (row=0; row<9; row++) {
@@ -154,6 +86,7 @@ function insertSingletonValues(fullArray){
 				console.log('Block is: ' + fullArray[row][col].block);
 				console.log('Possibles Array for location is ' + fullArray[row][col].possibles[0]);
 				buildPrinterString(fullArray);
+				findOptions(fullArray);
 			}
 		}
 	}
@@ -162,25 +95,26 @@ function insertSingletonValues(fullArray){
 		buildPrinterString(fullArray);
 		insertDupleValues(fullArray);
 	}
-	findOptions(fullArray);
 };
 
-
-
-
-
 function insertDupleValues(fullArray){
 	for (row=0; row<9; row++) {
 		for (col=0; col<9; col++) {
 			if (fullArray[row][col].possibles.length === 2 && fullArray[row][col].value === null) {
-				fullArray[row][col].value = fullArray[row][col].possibles[1];
-				arrayDepot.push(fullArray);
+				
+				//clone fullArray
+				var secondChoice = clone(fullArray);
+				//set secondchoice value to SECOND possibility
+				secondChoice[row][col].value = secondChoice[row][col].possibles[1];
+				//send full Array clone to arrayDepot
+				arrayDepot.push(secondChoice);
+				//set fullArray value to FIRST possibility
 				fullArray[row][col].value = fullArray[row][col].possibles[0];
 				console.log('duple assigned at ' + (col + 1) + ', ' + (9-row));
 				buildPrinterString(fullArray);
+				console.log('Other dupel possible ');
+				buildPrinterString(arrayDepot[arrayDepot.length-1]);
 				findOptions(fullArray);
-
-				return;
 			}
 		}
 	}
@@ -242,3 +176,16 @@ function boxDeletePossibles(possiblesList, callback){
 	})
 };
 
+function clone (existingArray) {
+   var newObj = (existingArray instanceof Array) ? [] : {};
+   for (i in existingArray) {
+      if (i == 'clone') continue;
+      if (existingArray[i] && typeof existingArray[i] == "object") {
+         newObj[i] = clone(existingArray[i]);
+      } else {
+         newObj[i] = existingArray[i]
+      }
+   }
+   return newObj;
+}
+