Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
12/11/17 22:10:01 (5 years ago)
Author:
abeham
Message:

#1614:

  • Fixed bugs in view
  • Made Evaluation object immutable
  • Fixed bug in Analyze
  • Fixed operators
Location:
branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3

    • Property svn:ignore
      •  

        old new  
         1*.user
        12Plugin.cs
         3bin
        24obj
        3 bin
  • branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/GQAP.cs

    r15506 r15510  
    154154      }
    155155      var archive = archiveResult.Value as GQAPAssignmentArchive;
    156       if (archive == null) archive = new GQAPAssignmentArchive(ProblemInstance);
    157       else archive.ProblemInstance = ProblemInstance;
     156      if (archive == null) {
     157        archive = new GQAPAssignmentArchive(ProblemInstance);
     158        archiveResult.Value = archive;
     159      } else archive.ProblemInstance = ProblemInstance;
    158160     
    159161      var combinedArchive = solutions
     
    401403
    402404    private void InitializeOperators() {
    403       Operators.Clear();
     405      Operators.RemoveAll(x => x is ISingleObjectiveMoveOperator);
     406      Operators.RemoveAll(x => x is SingleObjectiveImprover);
    404407      Operators.AddRange(ApplicationManager.Manager.GetInstances<IGQAPOperator>());
    405       Operators.RemoveAll(x => x is ISingleObjectiveMoveEvaluator);
    406408      Operators.AddRange(ApplicationManager.Manager.GetInstances<IGQAPMoveEvaluator>());
    407409      Operators.Add(new HammingSimilarityCalculator() { SolutionVariableName = Encoding.Name, QualityVariableName = Evaluator.QualityParameter.ActualName });
Note: See TracChangeset for help on using the changeset viewer.