Changeset 17002 for branches/2988_ModelsOfModels2/HeuristicLab.Algorithms.EMM/EMMNetworkMap.cs

Timestamp:

06/03/19 14:15:11 (5 years ago)

Author:

msemenki

Message:

#2988:
Class HelpFuction get new static functions that are used in different Map’s classes and possible in other classes.
Branch was adapted to Hive.
New version of class structure for Maps:

1. 3 new variants of maps (RankMap, SuccessMap and ZeroMap) are added.
2. BaseMap class was simplified, some class members were deleted and other were transported to child class, because some of them are not used in all kinds of maps.
3. Functions between base class and child class were divided in other way.
4. Mutation operators were adapted to work with new class structure. Now mutation make less work for ModelNodes than previously.
5. ModelNode and Model symbols were simplified. They should not take into account a map type.
6. Models frequency analyzers were adapted for new variants of maps.
7. EMMAlgorithm class was adapted to new maps

Location:

branches/2988_ModelsOfModels2/HeuristicLab.Algorithms.EMM

Files:

• . (modified) (1 prop)
• EMMNetworkMap.cs (modified) (3 diffs)

branches/2988_ModelsOfModels2/HeuristicLab.Algorithms.EMM

@@ -12 +12 @@
 *.nuget.props
 *.nuget.targets
+Plugin.cs

@@ -12 +12 @@
 *.nuget.props
 *.nuget.targets
+Plugin.cs

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

@@ -24 +24 @@
 using HeuristicLab.Core;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
+using HeuristicLab.Random;
 using System.Collections.Generic;
 
@@ -42 +43 @@
     }
     public EMMNetworkMap(EMMNetworkMap original, Cloner cloner) : base(original, cloner) { NeghboorNumber = original.NeghboorNumber; }
-    //public EMMNetworkMap(IRandom random, IEnumerable<ISymbolicExpressionTree> trees, int k, int neghboorNumber = 10) : this(neghboorNumber) {
-    //  // constructor that should be used in case of creation of a new map from the start point
-    //  ModelSet = trees.ToList();
-    //  CalculateDistances();
-    //  NeghboorNumber = neghboorNumber; // this shoud be done before map creation, so it is impossible to create tree wisout it
-    //  CreateMap(random, k);
-    //}
-    //public EMMNetworkMap(IRandom random, IEnumerable<ISymbolicExpressionTree> trees, string fileName = "Map.txt") : base(random, trees, fileName) {
-    //  NeghboorNumber = Map[0].Count;
-    //}
     #endregion
     #region MapTransformation
     override public void CreateMap(IRandom random, int k) {
-      K = Map.Count;
-      ApplyNetworkMapCreationAlgorithm(random, Distances, Map, K, NeghboorNumber);
-      for (int i = 0; i < Map.Count; i++) {
-        ClusterNumber.Add(i);
-      }
+      ApplyNetworkMapCreationAlgorithm(random, CalculateDistances(), Map, NeghboorNumber);
     }
-    public static void ApplyNetworkMapCreationAlgorithm(IRandom random, double[,] distances, List<List<int>> map, int k, int neghboorNumber = 10) {
+    public static void ApplyNetworkMapCreationAlgorithm(IRandom random, double[,] distances, List<List<int>> map, int neghboorNumber = 10) {
       int mapSize = distances.GetLength(0);
       List<double> currentList = new List<double>();
@@ -78 +65 @@
     #endregion
     #region Dialog with surroudings
-    override public ISymbolicExpressionTree NewModelForInizializtionNotTree(IRandom random, out int cluster, out int treeNumber) {
-      var newTree = NewModelForInizializtion(random, out cluster, out treeNumber);
+    public override ISymbolicExpressionTree NewModelForMutation(IRandom random, out int treeNumber, int parentTreeNumber) {
+      treeNumber = Map[parentTreeNumber].SampleRandom(random);
+      return (ISymbolicExpressionTree)ModelSet[treeNumber].Clone();
+    }
+    override public ISymbolicExpressionTree NewModelForInizializtionNotTree(IRandom random, out int treeNumber) {
+      var newTree = NewModelForInizializtion(random, out treeNumber);
       return newTree;
     }

@@ -12 +12 @@
 *.nuget.props
 *.nuget.targets
+Plugin.cs