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/TourEncoding.cs

    r7906 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
     22using System.Collections.Generic;
     23using System.Drawing;
    2224using HeuristicLab.Common;
    2325using HeuristicLab.Core;
    24 using HeuristicLab.Data;
    25 using HeuristicLab.Encodings.PermutationEncoding;
    2626using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    27 using System.Drawing;
    28 using System.Collections.Generic;
    2927using HeuristicLab.Problems.VehicleRouting.Interfaces;
    3028
     
    3634      get { return HeuristicLab.Common.Resources.VSImageLibrary.Class; }
    3735    }
    38    
     36
    3937    #region IVRPEncoding Members
    4038    public virtual void Repair() {
     
    5351
    5452        Tours.Remove(tour);
    55       } 
     53      }
    5654    }
    5755
    58     public virtual List<Tour> GetTours() {     
    59      List<Tour> result = new List<Tour>();
    60      foreach (Tour tour in Tours)
    61        result.Add(tour.Clone() as Tour);
     56    public virtual List<Tour> GetTours() {
     57      List<Tour> result = new List<Tour>();
     58      foreach (Tour tour in Tours)
     59        result.Add(tour.Clone() as Tour);
    6260
    63      return result;
     61      return result;
    6462    }
    6563
     
    8280
    8381    public int Cities {
    84       get
    85       {
     82      get {
    8683        int cities = 0;
    8784
     
    114111    protected TourEncoding(TourEncoding original, Cloner cloner)
    115112      : base(original, cloner) {
    116        this.Tours = (ItemList<Tour>)cloner.Clone(original.Tours);
    117        if (original.ProblemInstance != null && cloner.ClonedObjectRegistered(original.ProblemInstance))
    118          this.ProblemInstance = (IVRPProblemInstance)cloner.Clone(original.ProblemInstance);
    119        else
    120          this.ProblemInstance = original.ProblemInstance;
     113      this.Tours = (ItemList<Tour>)cloner.Clone(original.Tours);
     114      if (original.ProblemInstance != null && cloner.ClonedObjectRegistered(original.ProblemInstance))
     115        this.ProblemInstance = (IVRPProblemInstance)cloner.Clone(original.ProblemInstance);
     116      else
     117        this.ProblemInstance = original.ProblemInstance;
    121118    }
    122119
Note: See TracChangeset for help on using the changeset viewer.