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

@@ -35 +35 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using CancellationToken = System.Threading.CancellationToken;
@@ -56 +57 @@
     [Storable]
     protected ExecutionState previousExecutionState;
+    [Storable]
+    protected IEnumerable<ISymbolicExpressionTree> trees;
 
     [Storable]
@@ -77 +80 @@
     private const string ClusterNumbersParameterName = "ClusterNumbers";
     private const string ClusterNumbersShowParameterName = "ClusterNumbersShow";
-    private const string AlgorithmImplementationTypeParameterName = "AlgorithmImplemetationType";
+    private const string AlgorithmImplementationTypeParameterName = "AlgorithmImplementationType";
     private const string MapParameterName = "Map";
     private const string NegbourTypeParameterName = "NegbourType";
@@ -250 +253 @@
       ParameterizeSelectors();
 
+      //begin hack ...
+      InputFile.ValueChanged += InputFile_ValueChanged;
+      InfixExpressionParser parser = new InfixExpressionParser();
+      trees = File.ReadAllLines(InputFileParameter.Value.Value).Select(parser.Parse).ToArray();
+      // end hack
+
       ProblemChanged += EvolvmentModelsOfModelsAlgorithmBase_ProblemChanged;
       MapParameterUpdate();
-    }
+
+    }
+
+    // also hack vvvvvvvvv
+    private void InputFile_ValueChanged(object sender, EventArgs e) {
+      InfixExpressionParser parser = new InfixExpressionParser();
+      trees = File.ReadAllLines(InputFileParameter.Value.Value).Select(parser.Parse);
+    }
+    // remove again ^^^^^^^^^ 
 
     private void EvolvmentModelsOfModelsAlgorithmBase_ProblemChanged(object sender, EventArgs e) {
@@ -271 +288 @@
       {
         new EMMIslandMap(),
-        new EMMNetworkMap(neghboorNumber)
+        new EMMNetworkMap(neghboorNumber),
+        new EMMDisatanceMap(),
+        new EMMRankMap(),
+        new EMMSucsessMap (),
+        new EMMZeroMap ()
       };
       foreach (var t in mapTypes) {
@@ -314 +335 @@
         globalScope = cloner.Clone(original.globalScope);
       }
+
+      // hack
+      trees = original.trees.Select(x => cloner.Clone(x)).ToArray();
     }
 

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