Changeset 16096 for branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/ProblemCharacteristicAnalysis/QAP/QAPCharacteristicCalculator.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/HeuristicLab.Analysis.FitnessLandscape/3.3/ProblemCharacteristicAnalysis/QAP/QAPCharacteristicCalculator.cs (modified) (3 diffs)

branches/2457_ExpertSystem/HeuristicLab.Analysis.FitnessLandscape/3.3/ProblemCharacteristicAnalysis/QAP/QAPCharacteristicCalculator.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -26 +29 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.QuadraticAssignment;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 
 namespace HeuristicLab.Analysis.FitnessLandscape {
@@ -61 +61 @@
         if (chara == "Dimension")
           yield return new Result(chara, new IntValue(qap.Weights.Rows));
-        if (chara == "FlowDominance")
+        else if (chara == "FlowDominance")
           yield return new Result(chara, new DoubleValue(DoubleMatrixCharacteristicCalculator.CoeffVariation(qap.Weights)));
-        if (chara == "DistanceDominance")
+        else if (chara == "DistanceDominance")
           yield return new Result(chara, new DoubleValue(DoubleMatrixCharacteristicCalculator.CoeffVariation(qap.Distances)));
-        if (chara == "FlowAsymmetry")
+        else if (chara == "FlowAsymmetry")
           yield return new Result(chara, new DoubleValue(DoubleMatrixCharacteristicCalculator.Asymmetry(qap.Weights)));
-        if (chara == "DistanceAsymmetry")
+        else if (chara == "DistanceAsymmetry")
           yield return new Result(chara, new DoubleValue(DoubleMatrixCharacteristicCalculator.Asymmetry(qap.Distances)));
-        if (chara == "FlowSparsity")
+        else if (chara == "FlowSparsity")
           yield return new Result(chara, new DoubleValue(DoubleMatrixCharacteristicCalculator.Sparsity(qap.Weights)));
-        if (chara == "DistanceSparsity")
+        else if (chara == "DistanceSparsity")
           yield return new Result(chara, new DoubleValue(DoubleMatrixCharacteristicCalculator.Sparsity(qap.Distances)));
-        if (chara == "FlowSkewness")
+        else if (chara == "FlowSkewness")
           yield return new Result(chara, new DoubleValue(DoubleMatrixCharacteristicCalculator.Skewness(qap.Weights)));
-        if (chara == "DistanceSkewness")
+        else if (chara == "DistanceSkewness")
           yield return new Result(chara, new DoubleValue(DoubleMatrixCharacteristicCalculator.Skewness(qap.Distances)));
-        if (chara == "FlowDisparity")
+        else if (chara == "FlowDisparity")
           yield return new Result(chara, new DoubleValue(DoubleMatrixCharacteristicCalculator.Disparity(qap.Weights)));
-        if (chara == "DistanceDisparity")
+        else if (chara == "DistanceDisparity")
           yield return new Result(chara, new DoubleValue(DoubleMatrixCharacteristicCalculator.Disparity(qap.Distances)));
       }