Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
05/08/20 16:55:51 (4 years ago)
Author:
abeham
Message:

#2521: Unified architecture

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/AnalyticalPTSP.cs

    r17382 r17533  
    7171      for (var i = 0; i < tour.Length - 1; i++) {
    7272        for (var j = i + 1; j < tour.Length; j++) {
    73           var prod1 = data.TSPData.GetDistance(tour[i], tour[j]) * data.GetProbability(tour[i]) * data.GetProbability(tour[j]);
     73          var prod1 = data.GetDistance(tour[i], tour[j]) * data.GetProbability(tour[i]) * data.GetProbability(tour[j]);
    7474          for (var k = i + 1; k < j; k++) {
    7575            prod1 *= (1 - data.GetProbability(tour[k]));
     
    8181      for (var j = 0; j < tour.Length; j++) {
    8282        for (var i = 0; i < j; i++) {
    83           var prod2 = data.TSPData.GetDistance(tour[j], tour[i]) * data.GetProbability(tour[i]) * data.GetProbability(tour[j]);
     83          var prod2 = data.GetDistance(tour[j], tour[i]) * data.GetProbability(tour[i]) * data.GetProbability(tour[j]);
    8484          for (var k = j + 1; k < tour.Length; k++) {
    8585            prod2 *= (1 - data.GetProbability(tour[k]));
Note: See TracChangeset for help on using the changeset viewer.