Changeset 12799


Ignore:
Timestamp:
07/22/15 13:50:12 (6 years ago)
Author:
apolidur
Message:

#2221: Adding path Analyzers and some other fixes

Location:
branches/PTSP/HeuristicLab.Problems.PTSP/3.3
Files:
2 added
6 edited

Legend:

Unmodified
Added
Removed
  • branches/PTSP/HeuristicLab.Problems.PTSP/3.3/EstimatedPTSP.cs

    r12387 r12799  
    5353      Parameters.Add(new ValueParameter<IntValue>("RealizationsSize", "Size of the sample for the estimation-based evaluation"));
    5454      Parameters.Add(new ValueParameter<ItemList<ItemList<IntValue>>>("Realizations", "The concrete..."));
     55
     56      Operators.RemoveAll(x => x is ISingleObjectiveMoveEvaluator);
     57      Operators.RemoveAll(x => x is IMoveGenerator);
     58      Operators.RemoveAll(x => x is IMoveMaker);
     59
     60      Operators.Add(new BestPTSPSolutionAnalyzer());
     61
    5562      Operators.Add(new PTSPEstimatedInversionEvaluator());
    5663      Operators.Add(new PTSPEstimatedInsertionEvaluator());
  • branches/PTSP/HeuristicLab.Problems.PTSP/3.3/HeuristicLab.Problems.PTSP-3.3.csproj

    r12380 r12799  
    115115    <None Include="Plugin.cs.frame" />
    116116    <Compile Include="AnalyticalPTSP.cs" />
     117    <Compile Include="Analyzers\BestPTSPSolutionAnalyzer.cs" />
    117118    <Compile Include="DistanceMatrix.cs" />
    118119    <Compile Include="EstimatedPTSP.cs" />
  • branches/PTSP/HeuristicLab.Problems.PTSP/3.3/MoveEvaluators/OneShift/PTSPEstimatedInsertionEvaluator.cs

    r12380 r12799  
    157157      }
    158158      // return average of cost differences
    159       return moveQuality / realizations.Capacity;
     159      return moveQuality / realizations.Count;
    160160    }
    161161
  • branches/PTSP/HeuristicLab.Problems.PTSP/3.3/MoveEvaluators/TwoOpt/PTSPEstimatedInversionEvaluator.cs

    r12380 r12799  
    119119      }
    120120      // return average of cost differences
    121       return moveQuality / realizations.Capacity;
     121      return moveQuality / realizations.Count;
    122122    }
    123123
  • branches/PTSP/HeuristicLab.Problems.PTSP/3.3/MoveEvaluators/TwoPointFiveOpt/PTSP25MoveEvaluator.cs

    r12272 r12799  
    175175      }
    176176      // return average of cost differences
    177       return moveQuality / realizations.Capacity;
     177      return moveQuality / realizations.Count;
    178178    }
    179179    public static double EvaluateInsertionByDistanceMatrix(Permutation permutation, TwoPointFiveMove move, DistanceMatrix distanceMatrix, ItemList<ItemList<IntValue>> realizations) {
     
    258258      }
    259259      // return average of cost differences
    260       return moveQuality / realizations.Capacity;
     260      return moveQuality / realizations.Count;
    261261    }
    262262    protected double EvaluateByDistanceMatrix(Permutation permutation, DistanceMatrix distanceMatrix) {
  • branches/PTSP/HeuristicLab.Problems.PTSP/3.3/PathPTSPTour.cs

    r12228 r12799  
    3232  /// Represents a tour of a Probabilistic Traveling Salesman Problem given in path representation which can be visualized in the GUI.
    3333  /// </summary>
    34   [Item("PathTSPTour", "Represents a tour of a Probabilistic Traveling Salesman Problem given in path representation which can be visualized in the GUI.")]
     34  [Item("PathPTSPTour", "Represents a tour of a Probabilistic Traveling Salesman Problem given in path representation which can be visualized in the GUI.")]
    3535  [StorableClass]
    3636  public sealed class PathPTSPTour : Item {
Note: See TracChangeset for help on using the changeset viewer.