Changeset 15440 for branches/MCTS-SymbReg-2796/HeuristicLab.Algorithms.DataAnalysis

Timestamp:

10/29/17 21:22:21 (7 years ago)

Author:

gkronber

Message:

#2796 fixed hashing of expressions and unit tests for expression enumeration

Location:

branches/MCTS-SymbReg-2796/HeuristicLab.Algorithms.DataAnalysis/3.4

Files:

• HeuristicLab.Algorithms.DataAnalysis.MCTSSymbReg.csproj (modified) (1 diff)
• MctsSymbolicRegression/Automaton.cs (modified) (1 diff)
• MctsSymbolicRegression/ExprHash.cs (deleted)
• MctsSymbolicRegression/ExprHashSymbolic.cs (added)
• MctsSymbolicRegression/MctsSymbolicRegressionStatic.cs (modified) (3 diffs)

branches/MCTS-SymbReg-2796/HeuristicLab.Algorithms.DataAnalysis/3.4/HeuristicLab.Algorithms.DataAnalysis.MCTSSymbReg.csproj

@@ -104 +104 @@
     <Compile Include="MctsSymbolicRegression\Disassembler.cs" />
     <Compile Include="MctsSymbolicRegression\ExpressionEvaluator.cs" />
+    <Compile Include="MctsSymbolicRegression\ExprHashSymbolic.cs" />
     <Compile Include="MctsSymbolicRegression\MctsSymbolicRegressionAlgorithm.cs" />
     <Compile Include="MctsSymbolicRegression\MctsSymbolicRegressionStatic.cs" />
     <Compile Include="MctsSymbolicRegression\OpCodes.cs" />
-    <Compile Include="MctsSymbolicRegression\ExprHash.cs" />
     <Compile Include="MctsSymbolicRegression\SymbolicExpressionGenerator.cs" />
     <Compile Include="MctsSymbolicRegression\Tree.cs" />

branches/MCTS-SymbReg-2796/HeuristicLab.Algorithms.DataAnalysis/3.4/MctsSymbolicRegression/Automaton.cs

@@ -424 +424 @@
         v == StateLogTFEnd ||
         v == StateInvTFEnd ||
-        v == StateExpFEnd
+        v == StateExpFEnd ||
+        v == StateLogTEnd ||
+        v == StateInvTEnd ||
+        v == StateTermEnd 
         ;
     }

branches/MCTS-SymbReg-2796/HeuristicLab.Algorithms.DataAnalysis/3.4/MctsSymbolicRegression/MctsSymbolicRegressionStatic.cs

@@ -587 +587 @@
             // for selected states (EvalStates) we introduce state unification (detection of equivalent states)
             if (automaton.IsEvalState(possibleFollowStates[i])) {
-              var hc = Hashcode(automaton) * (ulong)tree.state; // TODO fix unit test for structure enumeration
+              var hc = Hashcode(automaton);
+              hc = ((hc << 5) + hc) ^ (ulong)tree.state; // TODO fix unit test for structure enumeration
               if (!state.nodes.TryGetValue(hc, out child)) {
+                // Console.WriteLine("New expression (hash: {0}, state: {1})", Hashcode(automaton), automaton.stateNames[possibleFollowStates[i]]);
                 child = new Tree() {
                   state = possibleFollowStates[i],
@@ -598 +600 @@
               // only allow forward edges (don't add the child if we would go back in the graph)
               else if (child.level > tree.level) {
+                // Console.WriteLine("Existing expression (hash: {0}, state: {1})", Hashcode(automaton), automaton.stateNames[possibleFollowStates[i]]);
                 // whenever we join paths we need to propagate back the statistics of the existing node through the newly created link
                 // to all parents 
                 BackpropagateStatistics(tree, state, child.visits);
               } else {
+                // Console.WriteLine("Cycle (hash: {0}, state: {1})", Hashcode(automaton), automaton.stateNames[possibleFollowStates[i]]);
                 // prevent cycles
                 Debug.Assert(child.level <= tree.level);
@@ -688 +692 @@
       int nParams;
       automaton.GetCode(out code, out nParams);
-      return ExprHash.GetHash(code, nParams);
+      return (ulong)ExprHashSymbolic.GetHash(code, nParams);
     }