Ignore:
Timestamp:
07/10/15 16:49:32 (7 years ago)
Author:
abeham
Message:

#2208: integrated orienteering problem into trunk

Location:
trunk/sources
Files:
4 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk/sources

  • trunk/sources/HeuristicLab.Tests

  • trunk/sources/HeuristicLab.Tests/HeuristicLab-3.3/DeepCloneableCloningTest.cs

    r12012 r12722  
    4141
    4242    public DeepCloneableCloningTest() {
    43       excludedTypes = new HashSet<Type>();
    44       excludedTypes.Add(typeof(HeuristicLab.Problems.DataAnalysis.Dataset));
    45       excludedTypes.Add(typeof(HeuristicLab.Problems.TravelingSalesman.DistanceMatrix));
    46       excludedTypes.Add(typeof(HeuristicLab.Problems.DataAnalysis.ClassificationEnsembleSolution));
    47       excludedTypes.Add(typeof(HeuristicLab.Problems.DataAnalysis.RegressionEnsembleSolution));
     43      excludedTypes = new HashSet<Type> {
     44        typeof (HeuristicLab.Problems.DataAnalysis.Dataset),
     45        typeof (HeuristicLab.Problems.TravelingSalesman.DistanceMatrix),
     46        typeof (HeuristicLab.Problems.DataAnalysis.ClassificationEnsembleSolution),
     47        typeof (HeuristicLab.Problems.DataAnalysis.RegressionEnsembleSolution),
     48        typeof (HeuristicLab.Problems.Orienteering.DistanceMatrix)
     49      };
    4850      excludedTypes.Add(typeof(SymbolicExpressionGrammar).Assembly.GetType("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.EmptySymbolicExpressionTreeGrammar"));
    4951
     
    8789        try {
    8890          item = (IDeepCloneable)Activator.CreateInstance(deepCloneableType, nonPublic: false);
    89         }
    90         catch { continue; } // no default constructor
     91        } catch { continue; } // no default constructor
    9192
    9293        IDeepCloneable clone = null;
    9394        try {
    9495          clone = (IDeepCloneable)item.Clone(new Cloner());
    95         }
    96         catch (Exception e) {
     96        } catch (Exception e) {
    9797          TestContext.WriteLine(Environment.NewLine + deepCloneableType.FullName + ":");
    9898          TestContext.WriteLine("ERROR! " + e.GetType().Name + @" was thrown during cloning.
  • trunk/sources/HeuristicLab.Tests/HeuristicLab.Tests.csproj

    r12700 r12722  
    346346      <SpecificVersion>False</SpecificVersion>
    347347      <HintPath>..\bin\HeuristicLab.Problems.Programmable.Views-3.3.dll</HintPath>
     348      <Private>False</Private>
     349    </Reference>
     350    <Reference Include="HeuristicLab.Problems.Orienteering-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     351      <HintPath>..\bin\HeuristicLab.Problems.Orienteering-3.3.dll</HintPath>
    348352      <Private>False</Private>
    349353    </Reference>
     
    418422    <Compile Include="HeuristicLab-3.3\PluginDependenciesTest.cs" />
    419423    <Compile Include="HeuristicLab-3.3\PluginLoader.cs" />
     424    <Compile Include="HeuristicLab-3.3\Samples\VnsOpSampleTest.cs" />
    420425    <Compile Include="HeuristicLab-3.3\Samples\EsGriewankSampleTest.cs" />
    421426    <Compile Include="HeuristicLab-3.3\Samples\GaussianProcessRegressionSampleTest.cs" />
Note: See TracChangeset for help on using the changeset viewer.