Changeset 16899 for branches/2988_ModelsOfModels2/HeuristicLab.Algorithms.EMM/EMMMultyPointsMutator.cs

Timestamp:

05/06/19 14:20:06 (5 years ago)

Author:

msemenki

Message:

#2988: New version of class structure.

File:

• branches/2988_ModelsOfModels2/HeuristicLab.Algorithms.EMM/EMMMultyPointsMutator.cs (modified) (4 diffs)

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

@@ -35 +35 @@
   [StorableType("918B5F77-3B9E-4620-94A3-236913C4A3F2")]
   public sealed class EMMMultyPointsMutator : SymbolicExpressionTreeManipulator {
-    private const string ModelSetParameterName = "Models";
-    private const string ClusterNumberParameterName = "ClusterNumber";
     private const string MapParameterName = "Map";
     private const string MutationProbabilityParameterName = "MutationProbability";
-    public ILookupParameter<ItemList<ISymbolicExpressionTree>> ModelSetParameter {
-      get { return (ILookupParameter<ItemList<ISymbolicExpressionTree>>)Parameters[ModelSetParameterName]; }
-    }
-    public ILookupParameter<ItemList<IntValue>> ClusterNumberParameter {
-      get { return (ILookupParameter<ItemList<IntValue>>)Parameters[ClusterNumberParameterName]; }
-    }
-
-    public ILookupParameter<ItemList<ItemList<IntValue>>> MapParameter {
-      get { return (ILookupParameter<ItemList<ItemList<IntValue>>>)Parameters[MapParameterName]; }
+    public ILookupParameter<EMMMapBase<ISymbolicExpressionTree>> MapParameter {
+      get { return (ILookupParameter<EMMMapBase<ISymbolicExpressionTree>>)Parameters[MapParameterName]; }
     }
     public ILookupParameter<PercentValue> MutationProbabilityParameter {
       get { return (ILookupParameter<PercentValue>)Parameters[MutationProbabilityParameterName]; }
     }
-    public ItemList<ISymbolicExpressionTree> ModelSet => ModelSetParameter.ActualValue;
-    public ItemList<IntValue> ClusterNumber => ClusterNumberParameter.ActualValue;
-    public ItemList<ItemList<IntValue>> Map => MapParameter.ActualValue;
+    public List<ISymbolicExpressionTree> ModelSet => MapParameter.ActualValue.ModelSet;
+    public List<int> ClusterNumber => MapParameter.ActualValue.ClusterNumber;
+    public List<List<int>> Map => MapParameter.ActualValue.Map;
     public PercentValue MutationProbability => MutationProbabilityParameter.ActualValue;
 
@@ -61 +52 @@
     private EMMMultyPointsMutator(EMMMultyPointsMutator original, Cloner cloner) : base(original, cloner) { }
     public EMMMultyPointsMutator() : base() {
-      Parameters.Add(new LookupParameter<ItemList<ISymbolicExpressionTree>>(ModelSetParameterName));
-      Parameters.Add(new LookupParameter<ItemList<IntValue>>(ClusterNumberParameterName));
-      Parameters.Add(new LookupParameter<ItemList<ItemList<IntValue>>>(MapParameterName));
+      Parameters.Add(new LookupParameter<EMMMapBase<ISymbolicExpressionTree>>(MapParameterName));
       Parameters.Add(new LookupParameter<PercentValue>(MutationProbabilityParameterName));
     }
@@ -81 +70 @@
       return false;
     }
-    public static void EMMOnePointMutatorPart(IRandom random, ISymbolicExpressionTree symbolicExpressionTree, ItemList<ISymbolicExpressionTree> modelSet, ItemList<IntValue> clusterNumber, ItemList<ItemList<IntValue>> map, PercentValue mutationProbability) {
+    public static void EMMOnePointMutatorPart(IRandom random, ISymbolicExpressionTree symbolicExpressionTree, List<ISymbolicExpressionTree> modelSet, List<int> clusterNumber, List<List<int>> map, PercentValue mutationProbability) {
 
       List<ISymbol> allowedSymbols = new List<ISymbol>();
@@ -113 +102 @@
 
             if (node is TreeModelTreeNode treeNode2) { // make rigth mutation for tree model
-              treeNode2.TreeNumber = map[pTemp].SampleRandom(random).Value;
+              treeNode2.TreeNumber = map[pTemp].SampleRandom(random);
               treeNode2.Tree = (ISymbolicExpressionTree)modelSet[treeNode2.TreeNumber].Clone();
               treeNode2.ClusterNumer = pTemp;