Changeset 16760 for branches/2988_ModelsOfModels2/HeuristicLab.Algorithms.EMM/EMMMutators.cs

Timestamp:

04/04/19 14:33:12 (5 years ago)

Author:

msemenki

Message:

#2988: ADD:

1. new type of mutation that respect node type and do not change trigonometric node to "add" node;
2. variation of previous mutation type that do not change type of terminal node;
3. some interface adjusting for comfort work with algorithm;
4. second variant of map, that is not "island" map but provide "net" map.

File:

• branches/2988_ModelsOfModels2/HeuristicLab.Algorithms.EMM/EMMMutators.cs (modified) (2 diffs)

branches/2988_ModelsOfModels2/HeuristicLab.Algorithms.EMM/EMMMutators.cs

@@ -71 +71 @@
 
     protected override void Manipulate(IRandom random, ISymbolicExpressionTree symbolicExpressionTree) {
-      //EMMMapTreeModel map= (EMMMapTreeModel)ExecutionContext.Scope.Variables["TreeModelMap"].Value;
       EMMMutatorsPart(random, symbolicExpressionTree, ModelSet, ClusterNumber, Map);
     }
@@ -121 +120 @@
 
         var newNode = newSymbol.CreateTreeNode();
-        if (newNode.HasLocalParameters)
-          if (newNode is TreeModelTreeNode treeNode) {
-            int p = random.Next(map.Count);
-            if (child is TreeModelTreeNode chNode) // in real life never bacame true. It need some cheking
-            { p = chNode.ClusterNumer; }
-            treeNode.TreeNumber = map[p].SampleRandom(random).Value;
-            treeNode.Tree = (ISymbolicExpressionTree)modelSet[treeNode.TreeNumber].Clone();
-            treeNode.SetLocalParameters(random, 0.5);
-          } else
-            newNode.ResetLocalParameters(random);
+
+        if (newNode is TreeModelTreeNode treeNode) {
+          int p = random.Next(map.Count);
+          if (child is TreeModelTreeNode chNode) { p = chNode.ClusterNumer; }
+          treeNode.TreeNumber = map[p].SampleRandom(random).Value;
+          treeNode.Tree = (ISymbolicExpressionTree)modelSet[treeNode.TreeNumber].Clone();
+          treeNode.ClusterNumer = p;
+          treeNode.SetLocalParameters(random, 0.5);
+        } else if (newNode.HasLocalParameters)
+          newNode.ResetLocalParameters(random);
         foreach (var subtree in child.Subtrees)
           newNode.AddSubtree(subtree);