Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/11/19 16:30:22 (5 years ago)
Author:
msemenki
Message:

#2988:

  1. The file system was changed, folders was added and part of files was transferred in these folders.
  2. HelpFunctions class was divided on 2 parts: HelpFuctions for common purposes static functions and SelfConfiguration that include functions for self-configuration mechanism realization (is used in EMMSucsessMap).
  3. Parts of self-configuration mechanism was transferred from EMMSucsessMap.cs to SelfConfiguration.cs. Now EMMSucsessMap used SelfConfiguration like one of data member. Other parts of project was adopted for this changing.
  4. FileComunication class was added. It include the majority of functions for printing to files or reading from files. Here were realized possibility to write and read to hl files.
  5. ModelTreeNode.cs has additional possibility - to write sub-model in string (then it is possible to write it in file).
  6. InfixExpressionFormatter.cs can work with TreeModelNode.
  7. Possibility for different map types to be readable from files was extended and cheeked.
  8. Such parameters like - ClusterNumbers, ClusterNumbersShow, NegbourNumber, NegbourType (that is used only in several maps) was transferred from EMMAlgorithm to Map Parameters. Now EMMBaseMap class inherited from ParameterizedNamedItem (not from Item). And EMMIslandMap and EMMNetworkMap contains their parameters (constructors was modified). CreationMap calls functions were simplified.
  9. Functions for different distance metric calculation was added. Now, it is possible to calculate different types of distances between models (with different random values of constants).
  10. DistanceParametr was added. Now maps can be created according different types of distance calculations.
  11. The class EMMClustering has new name KMeansClusterizationAlgorithm. On KMeansClusterizationAlgorithm bug with bloating of centroids list was fixed. Algorithm was adopted for working with different type of distance metric and get maximum number of iterations.
  12. Possibilities for constants optimization in sub-models an whole tree was added. EMMAlgorithm get new function for evaluation of individuals (and some additional technical stuff for that). Function for trees with model in usual tree transformation and back was added.
  13. EMMAlgorithm was divided on 2 parts:
  • EMMAlgorithm, that contain evolutionary algorithm working with sub-models, and use ready to use maps;
  • ModelSetPreparation, that contain distance calculation, model set simplification and map creation.
Location:
branches/2988_ModelsOfModels2/HeuristicLab.Algorithms.EMM/Maps
Files:
1 added
1 moved

Legend:

Unmodified
Added
Removed
  • branches/2988_ModelsOfModels2/HeuristicLab.Algorithms.EMM/Maps/EMMNetworkMap.cs

    r17133 r17134  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
     25using HeuristicLab.Data;
    2526using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
     27using HeuristicLab.Parameters;
     28using HeuristicLab.Problems.DataAnalysis.Symbolic;
    2629using HeuristicLab.Random;
     30using System;
    2731using System.Collections.Generic;
    2832
     
    3135  [StorableType("C200ECC2-6D33-4468-A538-580B07D75B3C")]
    3236  public class EMMNetworkMap : EMMMapBase<ISymbolicExpressionTree> {
    33     public int NeghboorNumber { get; set; }
    34     #region conctructors
     37    private const string NegbourTypeParameterName = "NegbourType";
     38    private const string NegbourNumberParameterName = "NegbourNumber";
     39    public IFixedValueParameter<StringValue> NegbourTypeParameter {
     40      get { return (IFixedValueParameter<StringValue>)Parameters[NegbourTypeParameterName]; }
     41    }
     42    public IValueParameter<IntValue> NegbourNumberParameter {
     43      get { return (IValueParameter<IntValue>)Parameters[NegbourNumberParameterName]; }
     44    }
     45    public StringValue NegbourType {
     46      get { return NegbourTypeParameter.Value; }
     47      set { NegbourTypeParameter.Value.Value = value.Value; }
     48    }
     49    public IntValue NegbourNumber {
     50      get { return NegbourNumberParameter.Value; }
     51      set { NegbourNumberParameter.Value.Value = value.Value; }
     52    }
     53    #region constructors
    3554    [StorableConstructor]
    3655    protected EMMNetworkMap(StorableConstructorFlag _) : base(_) { }
    37     public EMMNetworkMap() : this(1) { }
     56
    3857    public override IDeepCloneable Clone(Cloner cloner) {
    3958      return new EMMNetworkMap(this, cloner);
    4059    }
    41     public EMMNetworkMap(int neghboorNumber = 10) : base() {
    42       NeghboorNumber = neghboorNumber;
     60    public EMMNetworkMap() : base() {
     61      Parameters.Add(new ValueParameter<IntValue>(NegbourNumberParameterName, "The parameter for FullMap type of map creation algorithm. Use one from: 10, 20.", new IntValue(10)));
     62      Parameters.Add(new FixedValueParameter<StringValue>(NegbourTypeParameterName, "The parameter for FullMap type of map creation algorithm. Use one from: Percent, Number.", new StringValue("Number")));
     63      MapParameterUpdate();
     64      ModelSet = new List<ISymbolicExpressionTree>();
    4365    }
    44     public EMMNetworkMap(EMMNetworkMap original, Cloner cloner) : base(original, cloner) { NeghboorNumber = original.NeghboorNumber; }
     66    public EMMNetworkMap(EMMNetworkMap original, Cloner cloner) : base(original, cloner) { NegbourNumber = original.NegbourNumber; }
    4567    #endregion
    46     #region MapTransformation
    47     override public void CreateMap(IRandom random, int k) {
    48       ApplyNetworkMapCreationAlgorithm(random, CalculateDistances(), Map, NeghboorNumber);
     68    #region Map Transformation
     69    override public void CreateMap(IRandom random) {
     70      MapParameterUpdate();
     71      if (Map != null) {
     72        Map.Clear();
     73      }
     74      ApplyNetworkMapCreationAlgorithm(random, ModelSetPreparation.CalculateDistances(ModelSet), Map, NegbourNumber.Value);
     75    }
     76    override public void CreateMap(IRandom random, ISymbolicDataAnalysisSingleObjectiveProblem problem) {
     77      MapParameterUpdate();
     78      if (Map != null) {
     79        Map.Clear();
     80      }
     81      ApplyNetworkMapCreationAlgorithm(random, ModelSetPreparation.DistanceMatrixCalculation(ModelSet, DistanceParametr, problem), Map, NegbourNumber.Value);
     82    }
     83    override public void MapRead(IEnumerable<ISymbolicExpressionTree> trees) {
     84      base.MapRead(trees);
     85      string fileName = ("Map" + DistanceParametr + ".txt");
     86      Map = FileComuncations.IntMatrixFromFileRead(fileName);
     87      NegbourNumber.Value = Map[0].Count;
    4988    }
    5089    public static void ApplyNetworkMapCreationAlgorithm(IRandom random, double[,] distances, List<List<int>> map, int neghboorNumber = 10) {
     
    63102      }
    64103    }
     104    protected void MapParameterUpdate() {
     105      switch (NegbourType.Value) {
     106        case "Percent": NegbourNumber.Value = Convert.ToInt32((Convert.ToDouble(ModelSet.Count)) * (Convert.ToDouble(NegbourNumber.Value)) / 100.0); break;
     107        case "Number": NegbourNumber.Value = NegbourNumber.Value; break;
     108        default: NegbourNumber.Value = NegbourNumber.Value; break;
     109      }
     110    }
    65111    #endregion
    66     #region Dialog with surroudings
     112    #region Dialog with surroundings
    67113    public override ISymbolicExpressionTree NewModelForMutation(IRandom random, out int treeNumber, int parentTreeNumber) {
    68114      treeNumber = Map[parentTreeNumber].SampleRandom(random);
Note: See TracChangeset for help on using the changeset viewer.