Changeset 16734 for branches/2988_ModelsOfModels2/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols

Timestamp:

04/01/19 13:03:13 (6 years ago)

Author:

msemenki

Message:

#2988: Add Model Symbol Frequency Analyzer and Model's Clusters Frequency Analyzer. Fix Bag's with Keys. Fix changing during mutation for Variables Types in SubModels .

Location:

branches/2988_ModelsOfModels2/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols

Files:

• ModelTreeNode.cs (modified) (3 diffs)
• TreeModel.cs (modified) (2 diffs)

branches/2988_ModelsOfModels2/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/ModelTreeNode.cs

@@ -25 +25 @@
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Random;
-using System.Collections.Generic;
-
+using System.Linq;
 
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
-  [StorableType("38C37AED-5B9D-488E-8785-D8FF541D9B4C")]
+  [StorableType("44B25E73-6C4D-404C-93E5-42B7D2807CF7")]
   public sealed class TreeModelTreeNode : SymbolicExpressionTreeTerminalNode {
     public new TreeModel Symbol {
@@ -71 +70 @@
       get { return true; }
     }
-    //public override void ResetLocalParameters(IRandom random, List<ISymbolicExpressionTree> modelSet, List<List<int>> map, List<int> cLusterNumber) {
-    //  base.ResetLocalParameters(random);
-    //  if (ClusterNumer < 0) {
-    //    //Tree = map.NewModelForInizializtion(ClusterNumer, random);
-    //    var selectedNodelNumber = random.Next(modelSet.Count);
-    //    ClusterNumer = cLusterNumber[selectedNodelNumber];
-    //    TreeNumber = selectedNodelNumber;
-    //    Tree = (ISymbolicExpressionTree)modelSet[selectedNodelNumber].Clone();
-    //  } else {
-    //    //New Model For Mutation Adding
-    //    var selectedNodelNumber = random.Next(map[ClusterNumer].Count);
-    //    TreeNumber = selectedNodelNumber;
-    //    Tree = (ISymbolicExpressionTree)modelSet[map[ClusterNumer][selectedNodelNumber]].Clone();
-    //  }
-
-    //}
-
     public override void ShakeLocalParameters(IRandom random, double shakingFactor) {
       base.ShakeLocalParameters(random, shakingFactor);
-      List<ISymbolicExpressionTreeNode> parametricNodes = new List<ISymbolicExpressionTreeNode>();
-      Tree.Root.ForEachNodePostfix(n => {
-        if (n.HasLocalParameters) parametricNodes.Add(n);
-      });
-      if (parametricNodes.Count > 0) {
+      var parametricNodes = Tree.IterateNodesPrefix().Where(x => x.HasLocalParameters).ToList();
+      if (parametricNodes.Any()) {
         var selectedPoint = parametricNodes.SampleRandom(random);
-        selectedPoint.ShakeLocalParameters(random, shakingFactor);
+        if (selectedPoint is VariableTreeNode variableTreeNode) {
+          var symbol = variableTreeNode.Symbol;
+          variableTreeNode.Weight = NormalDistributedRandom.NextDouble(random, symbol.WeightManipulatorMu, symbol.WeightManipulatorSigma);
+        } else {
+          selectedPoint.ShakeLocalParameters(random, shakingFactor);
+        }
+
       }
     }
-
+    public void SetLocalParameters(IRandom random, double shakingFactor) {
+      foreach (var node in Tree.IterateNodesPrefix().Where(x => x.HasLocalParameters)) {
+        if (node is VariableTreeNode variableTreeNode) {
+          var symbol = variableTreeNode.Symbol;
+          variableTreeNode.Weight = NormalDistributedRandom.NextDouble(random, symbol.WeightManipulatorMu, symbol.WeightManipulatorSigma);
+        } else {
+          node.ResetLocalParameters(random);
+        }
+      }
+    }
     public override IDeepCloneable Clone(Cloner cloner) {
       return new TreeModelTreeNode(this, cloner);
@@ -106 +100 @@
     public override string ToString() {
 
-      string s = "model" +" " +TreeNumber.ToString()+"\n " + new InfixExpressionFormatter().Format(tree);
+      string s = "model" + " " + TreeNumber.ToString() + "\n " + new InfixExpressionFormatter().Format(tree);
       return s;
     }

branches/2988_ModelsOfModels2/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/TreeModel.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
-using HEAL.Attic;
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
-  [StorableType("F8A6AD96-28D9-4BEC-8392-8B7BA824B085")]
+  [StorableType("6F628649-7C71-49F3-862A-0BAB4BADF964")]
   public sealed class TreeModel : Symbol {
 
@@ -39 +37 @@
     [StorableConstructor]
     private TreeModel(StorableConstructorFlag _) : base(_) { }
-    private TreeModel(TreeModel original, Cloner cloner) : base(original, cloner) {   }
-    public TreeModel() : base("TreeModel", "Represents a TreeModel.") {    }
+    private TreeModel(TreeModel original, Cloner cloner) : base(original, cloner) { }
+    public TreeModel() : base("TreeModel", "Represents a TreeModel.") { }
     public override ISymbolicExpressionTreeNode CreateTreeNode() {
-      return new TreeModelTreeNode(this); }  
+      return new TreeModelTreeNode(this);
+    }
 
     public override IDeepCloneable Clone(Cloner cloner) {