Changeset 16096 for branches/2457_ExpertSystem/ProblemInstanceIdentifier/InstanceDescriptor.cs

Timestamp:

08/29/18 18:16:05 (6 years ago)

Author:

abeham

Message:

#2457:

• Changed calculation of correlation length (using limit introduced Hordijk 1996)
• Changed RuggednessCalculator (no more a HL item)
• Added additional, information-analysis-based features for directed walks
• Added generic DirectedWalk algorithm (as described in thesis)
• Made OneSizeInstanceProvider parametrizable
• Adapted program for analyzing problem instance reidentification

File:

• branches/2457_ExpertSystem/ProblemInstanceIdentifier/InstanceDescriptor.cs (modified) (4 diffs)

branches/2457_ExpertSystem/ProblemInstanceIdentifier/InstanceDescriptor.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
-using HeuristicLab.Analysis.FitnessLandscape;
 using HeuristicLab.Common;
-using HeuristicLab.Encodings.PermutationEncoding;
 using HeuristicLab.Problems.QuadraticAssignment;
 
@@ -16 +13 @@
     public string[] FeatureNames { get; set; }
     public double[] FeatureValues { get; set; }
+
+    public double DescriptionEffort { get; set; }
     
     private InstanceDescriptor() { }
@@ -33 +32 @@
       FeatureNames = (string[])other.FeatureNames.Clone();
       FeatureValues = (double[]) other.FeatureValues.Clone();
+      DescriptionEffort = other.DescriptionEffort;
     }
 
@@ -41 +41 @@
         Dimension = qap.Weights.Rows,
         FeatureNames = new string[0],
-        FeatureValues = new double[0]
-      };
-    }
-
-    public static InstanceDescriptor FromPaths(QuadraticAssignmentProblem qap, List<List<Tuple<Permutation, double>>> trajectories) {
-      var result = PermutationPathAnalysis.GetCharacteristics(trajectories);
-
-      return new InstanceDescriptor() {
-        Name = qap.Name,
-        Cls = GetClass(qap.Name),
-        Dimension = qap.Weights.Rows,
-        FeatureNames = result.GetNames(),
-        FeatureValues = result.GetValues()
+        FeatureValues = new double[0],
+        DescriptionEffort = 0
       };
     }