Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
06/19/12 13:17:29 (12 years ago)
Author:
ascheibe
Message:

#1722 fixed more licensing information and source formatting

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/VRPMoveMaker.cs

    r7852 r8053  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2020#endregion
    2121
    22 using System;
    2322using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
     23using HeuristicLab.Common;
     24using HeuristicLab.Core;
     25using HeuristicLab.Data;
     26using HeuristicLab.Optimization;
     27using HeuristicLab.Parameters;
    2628using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    27 using HeuristicLab.Core;
    28 using HeuristicLab.Optimization;
    29 using HeuristicLab.Data;
    30 using HeuristicLab.Parameters;
    3129using HeuristicLab.Problems.VehicleRouting.Interfaces;
    32 using HeuristicLab.Common;
    3330
    3431namespace HeuristicLab.Problems.VehicleRouting.Encodings.General {
     
    6562      IVRPEvaluator evaluator = ProblemInstance.SolutionEvaluator;
    6663      ICollection<IParameter> addedParameters = new List<IParameter>();
    67      
     64
    6865      try {
    6966        foreach (IParameter parameter in evaluator.Parameters) {
    70           if (parameter is ILookupParameter 
    71             && parameter != evaluator.VRPToursParameter 
     67          if (parameter is ILookupParameter
     68            && parameter != evaluator.VRPToursParameter
    7269            && parameter != evaluator.ProblemInstanceParameter) {
    7370            ILookupParameter evaluatorParameter = parameter as ILookupParameter;
    74          
     71
    7572            string resultName = evaluatorParameter.ActualName;
    7673            if (!this.Parameters.ContainsKey(resultName)) {
     
    8481            if (!this.Parameters.ContainsKey(moveResultName)) {
    8582              ILookupParameter moveResultParameter = new LookupParameter<IItem>(moveResultName);
    86               moveResultParameter.ExecutionContext = ExecutionContext; 
     83              moveResultParameter.ExecutionContext = ExecutionContext;
    8784              this.Parameters.Add(moveResultParameter);
    8885              addedParameters.Add(moveResultParameter);
     
    9693      }
    9794      finally {
    98         foreach(IParameter parameter in addedParameters) {
     95        foreach (IParameter parameter in addedParameters) {
    9996          this.Parameters.Remove(parameter);
    10097        }
     
    105102      PerformMove();
    106103      UpdateMoveEvaluation();
    107      
     104
    108105      return base.Apply();
    109106    }
Note: See TracChangeset for help on using the changeset viewer.