Changeset 17002 for branches/2988_ModelsOfModels2/HeuristicLab.Algorithms.EMM/EMMIslandMap.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)
• EMMIslandMap.cs (modified) (2 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/EMMIslandMap.cs

@@ -24 +24 @@
 using HeuristicLab.Core;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
+using HeuristicLab.Random;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace HeuristicLab.Algorithms.EvolvmentModelsOfModels {
@@ -30 +32 @@
   [StorableType("E4AB04B9-FD5D-47EE-949D-243660754F3A")]
   public class EMMIslandMap : EMMMapBase<ISymbolicExpressionTree> {
+    [Storable]
+    public List<int> ClusterNumber { get; set; }  // May be only Island Map really need it
     #region conctructors
     [StorableConstructor]
     protected EMMIslandMap(StorableConstructorFlag _) : base(_) { }
-    public EMMIslandMap() : this(1) { }
+    public EMMIslandMap() {
+      ModelSet = new List<ISymbolicExpressionTree>();
+      ClusterNumber = new List<int>();
+    }
     public override IDeepCloneable Clone(Cloner cloner) {
       return new EMMIslandMap(this, cloner);
     }
-    public EMMIslandMap(int k) : base(k) { ModelSet = new List<ISymbolicExpressionTree>(); }
-    public EMMIslandMap(EMMIslandMap original, Cloner cloner) : base(original, cloner) { }
-    // public EMMIslandMap(IRandom random, IEnumerable<ISymbolicExpressionTree> trees, int k, int neghboorNumber) : base(random, trees, k) { }
-    //public EMMIslandMap(IRandom random, IEnumerable<ISymbolicExpressionTree> trees, string fileName = "Map.txt") : base(random, trees, fileName) { }
+    public EMMIslandMap(EMMIslandMap original, Cloner cloner) : base(original, cloner) {
+      if (original.ClusterNumber != null) {
+        ClusterNumber = original.ClusterNumber.ToList();
+      }
+    }
     #endregion
     #region MapApplayFunctions
     override public void CreateMap(IRandom random, int k) {
-      K = EMModelsClusterizationAlgorithm.ApplyClusteringAlgorithm(random, Distances, ClusterNumber, k);
-      MapSizeCheck();
+
+      k = EMModelsClusterizationAlgorithm.ApplyClusteringAlgorithm(random, CalculateDistances(), ClusterNumber, k);
+      MapSizeCheck(k);
       for (int i = 0; i < ModelSet.Count; i++) {
         Map[ClusterNumber[i]].Add(i);
       }
     }
-    override public ISymbolicExpressionTree NewModelForInizializtionNotTree(IRandom random, out int cluster, out int treeNumber) {
-      return NewModelForInizializtion(random, out cluster, out treeNumber);
+    override public ISymbolicExpressionTree NewModelForInizializtionNotTree(IRandom random, out int treeNumber) {
+      return NewModelForInizializtion(random, out treeNumber);
+    }
+
+    public override ISymbolicExpressionTree NewModelForMutation(IRandom random, out int treeNumber, int parentTreeNumber) {
+      if (parentTreeNumber == -10) {
+        treeNumber = random.Next(ModelSet.Count);
+      } else {
+        treeNumber = Map[ClusterNumber[parentTreeNumber]].SampleRandom(random);
+      }
+      return (ISymbolicExpressionTree)ModelSet[treeNumber].Clone();
+    }
+    public void ClusterNumbersCalculate() {  // May be it should be transported to Child Clase (IslandMap)
+      for (int i = 0; i < Map.Count; i++) {
+        for (int j = 0; j < Map[i].Count; j++) {
+          ClusterNumber.Add(0);
+        }
+      }
+      for (int i = 0; i < Map.Count; i++) {
+        for (int j = 0; j < Map[i].Count; j++) {
+          ClusterNumber[Map[i][j]] = i;
+        }
+      }
     }
     #endregion

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