Merge branch 'TeamCGPU_TestWithBaseLayer' into Team_CMU_MergeBase

2017-12-18 21:24:21 +01:00
parent 0048f5b42d
commit 90e31ddba6
6 changed files with 247 additions and 16 deletions
--- a/Source/functions/solve/structure.cpp
+++ b/Source/functions/solve/structure.cpp
@ -83,10 +83,10 @@ void solve(vector<LogEntry>& log, vector<PuzzlePiece*>& p_Box, Puzzle& puzzleMat
        break;
    }

-    capLogElements(log);
-    calculateWorth(log);
-    calculateTrueDestructionPower(log,puzzleMat);
-    calculateNewCombinedProbablility(log);
+    //capLogElements(log);
+    //calculateWorth(log);
+    //calculateTrueDestructionPower(log,puzzleMat);
+    //calculateNewCombinedProbablility(log);

 }