Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
02/10/15 09:57:29 (10 years ago)
Author:
pfleck
Message:

#2269 merged trunk

Location:
branches/ALPS
Files:
2 deleted
5 edited
15 copied

Legend:

Unmodified
Added
Removed

  • branches/ALPS

  • branches/ALPS/HeuristicLab.Tests

  • branches/ALPS/HeuristicLab.Tests/HeuristicLab-3.3/DeepCloneableCloningTest.cs

    r11677 r11975  
    119119    private bool ProcessEqualObjects(IDeepCloneable item, IEnumerable<object> intersections) {
    120120      bool success = true;
    121       TestContext.WriteLine(Environment.NewLine + item.GetType().FullName + ":");
     121      bool headerWritten = false;
     122
    122123      foreach (object o in intersections) {
    123124        string typeName = o.GetType().FullName;
    … …  
    126127        } else if (o is IDeepCloneable) {
    127128          string info = (o is IItem) ? ((IItem)o).ItemName + ((o is INamedItem) ? ", " + ((INamedItem)o).Name : String.Empty) : String.Empty;
     129          if (!headerWritten) {
     130            TestContext.WriteLine(Environment.NewLine + item.GetType().FullName + ":");
     131            headerWritten = true;
     132          }
    128133          TestContext.WriteLine("POTENTIAL ERROR! A DEEPCLONEABLE WAS NOT DEEP CLONED (" + info + "): " + typeName);
    129134          success = false;
    130         } else
     135        } else {
     136          Array array = o as Array;
     137          if (array != null && array.Length == 0) continue; //arrays of length 0 are used inside empty collections
     138          if (!headerWritten) {
     139            TestContext.WriteLine(Environment.NewLine + item.GetType().FullName + ":");
     140            headerWritten = true;
     141          }
    131142          TestContext.WriteLine("WARNING: An object of type " + typeName + " is referenced in the original and in the clone.");
     143        }
    132144      }
    133145      return success;

  • branches/ALPS/HeuristicLab.Tests/HeuristicLab.Scripting-3.3/ScriptingUtils.cs

    r11677 r11975  
    2121
    2222using System;
    23 using System.IO;
    2423using System.Threading;
    2524using HeuristicLab.Scripting;
    … …  
    3837
    3938      s.ScriptExecutionFinished += (sender, e) => { ex = e.Value; trigger.Set(); };
    40       s.Execute();
     39      s.ExecuteAsync();
    4140      trigger.WaitOne();
    4241
    … …  
    4746      return (T)a.VariableStore[resultName];
    4847    }
    49 
    50     public static string LoadScriptCodeFromFile(string scriptName) {
    51       string path = Path.Combine(ScriptSourcesDirectory, scriptName + ScriptSourceFileExtension);
    52       return File.ReadAllText(path);
    53     }
    5448  }
    5549}

  • branches/ALPS/HeuristicLab.Tests/HeuristicLab.Tests.csproj

    r11677 r11975  
    133133      <Private>False</Private>
    134134    </Reference>
     135    <Reference Include="HeuristicLab.Algorithms.ParameterlessPopulationPyramid-3.3">
     136      <SpecificVersion>False</SpecificVersion>
     137      <HintPath>..\bin\HeuristicLab.Algorithms.ParameterlessPopulationPyramid-3.3.dll</HintPath>
     138      <Private>False</Private>
     139    </Reference>
    135140    <Reference Include="HeuristicLab.Algorithms.ParticleSwarmOptimization-3.3">
    136141      <HintPath>..\bin\HeuristicLab.Algorithms.ParticleSwarmOptimization-3.3.dll</HintPath>
    … …  
    249254      <Private>False</Private>
    250255    </Reference>
     256    <Reference Include="HeuristicLab.Problems.BinaryVector-3.3">
     257      <SpecificVersion>False</SpecificVersion>
     258      <HintPath>..\bin\HeuristicLab.Problems.BinaryVector-3.3.dll</HintPath>
     259      <Private>False</Private>
     260    </Reference>
    251261    <Reference Include="HeuristicLab.Problems.DataAnalysis-3.4">
    252262      <HintPath>..\bin\HeuristicLab.Problems.DataAnalysis-3.4.dll</HintPath>
    … …  
    269279      <Private>False</Private>
    270280    </Reference>
     281    <Reference Include="HeuristicLab.Problems.ExternalEvaluation-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     282      <SpecificVersion>False</SpecificVersion>
     283      <HintPath>..\bin\HeuristicLab.Problems.ExternalEvaluation-3.4.dll</HintPath>
     284      <Private>False</Private>
     285    </Reference>
     286    <Reference Include="HeuristicLab.Problems.ExternalEvaluation.GP-3.5, Version=3.5.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     287      <SpecificVersion>False</SpecificVersion>
     288      <HintPath>..\bin\HeuristicLab.Problems.ExternalEvaluation.GP-3.5.dll</HintPath>
     289      <Private>False</Private>
     290    </Reference>
     291    <Reference Include="HeuristicLab.Problems.ExternalEvaluation.Views-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     292      <SpecificVersion>False</SpecificVersion>
     293      <HintPath>..\bin\HeuristicLab.Problems.ExternalEvaluation.Views-3.4.dll</HintPath>
     294      <Private>False</Private>
     295    </Reference>
    271296    <Reference Include="HeuristicLab.Problems.GrammaticalEvolution-3.3">
    272297      <HintPath>..\bin\HeuristicLab.Problems.GrammaticalEvolution-3.3.dll</HintPath>
    … …  
    311336    <Reference Include="HeuristicLab.Problems.LinearAssignment-3.3">
    312337      <HintPath>..\bin\HeuristicLab.Problems.LinearAssignment-3.3.dll</HintPath>
     338      <Private>False</Private>
     339    </Reference>
     340    <Reference Include="HeuristicLab.Problems.Programmable-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     341      <SpecificVersion>False</SpecificVersion>
     342      <HintPath>..\bin\HeuristicLab.Problems.Programmable-3.3.dll</HintPath>
     343      <Private>False</Private>
     344    </Reference>
     345    <Reference Include="HeuristicLab.Problems.Programmable.Views-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     346      <SpecificVersion>False</SpecificVersion>
     347      <HintPath>..\bin\HeuristicLab.Problems.Programmable.Views-3.3.dll</HintPath>
    313348      <Private>False</Private>
    314349    </Reference>
    … …  
    411446    <Compile Include="HeuristicLab.Algorithms.DataAnalysis-3.4\GaussianProcessFunctionsTest.cs" />
    412447    <Compile Include="HeuristicLab.Algorithms.DataAnalysis-3.4\GaussianProcessRegressionTest.cs" />
     448    <Compile Include="HeuristicLab.Algorithms.ParameterlessPopulationPyramid-3.3\EnumerableBoolEqualityComparerTest.cs" />
     449    <Compile Include="HeuristicLab.Algorithms.ParameterlessPopulationPyramid-3.3\LinkageTreeTest.cs" />
     450    <Compile Include="HeuristicLab.Algorithms.ParameterlessPopulationPyramid-3.3\ParameterlessPopulationPyramidTest.cs" />
     451    <Compile Include="HeuristicLab.Analysis-3.3\BonferroniHolmUnitTests.cs" />
     452    <Compile Include="HeuristicLab.Analysis-3.3\ConfidenceIntervalsTests.cs" />
     453    <Compile Include="HeuristicLab.Analysis-3.3\EffectSizeUnitTests.cs" />
     454    <Compile Include="HeuristicLab.Analysis-3.3\KruskalWallisUnitTests.cs" />
    413455    <Compile Include="HeuristicLab.Analysis-3.3\MultidimensionalScalingTest.cs" />
    414456    <Compile Include="HeuristicLab.Collections-3.3\BidirectionalDictionaryTest.cs" />
    … …  
    488530    <Compile Include="HeuristicLab.Problems.DataAnalysis-3.4\OnlineCalculatorPerformanceTest.cs" />
    489531    <Compile Include="HeuristicLab.Problems.DataAnalysis-3.4\StatisticCalculatorsTest.cs" />
     532    <Compile Include="HeuristicLab.Problems.DataAnalysis.Symbolic-3.4\SymbolicExpressionTreeBottomUpSimilarityCalculatorTest.cs" />
     533    <Compile Include="HeuristicLab.Problems.DataAnalysis.Symbolic-3.4\SymbolicExpressionTreeMaxCommonSubtreeSimilarityCalculatorTest.cs" />
    490534    <Compile Include="HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis-3.4\SymbolicDataAnalysisExpressionTreeInterpreterTest.cs" />
    491535    <Compile Include="HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis-3.4\Util.cs" />
    … …  
    518562    <Compile Include="HeuristicLab.Problems.VehicleRouting-3.4\VRPInstancesTest.cs" />
    519563    <Compile Include="HeuristicLab.Random-3.3\RandomEnumerableSampleTest.cs" />
    520     <Compile Include="HeuristicLab.Scripting-3.3\Scripts\GAQAPScriptTest.cs" />
    521     <Compile Include="HeuristicLab.Scripting-3.3\Scripts\GridSearchRFClassificationScriptTest.cs" />
    522     <Compile Include="HeuristicLab.Scripting-3.3\Scripts\GridSearchRFRegressionScriptTest.cs" />
    523     <Compile Include="HeuristicLab.Scripting-3.3\Scripts\GridSearchSVMClassificationScriptTest.cs" />
    524     <Compile Include="HeuristicLab.Scripting-3.3\Scripts\GridSearchSVMRegressionScriptTest.cs" />
     564    <Compile Include="HeuristicLab.Scripting-3.3\GAQAPScriptTest.cs" />
     565    <Compile Include="HeuristicLab.Scripting-3.3\GridSearchRFClassificationScriptTest.cs" />
     566    <Compile Include="HeuristicLab.Scripting-3.3\GridSearchRFRegressionScriptTest.cs" />
     567    <Compile Include="HeuristicLab.Scripting-3.3\GridSearchSVMClassificationScriptTest.cs" />
     568    <Compile Include="HeuristicLab.Scripting-3.3\GridSearchSVMRegressionScriptTest.cs" />
     569    <Compile Include="HeuristicLab.Scripting-3.3\Script Sources\ScriptSources.Designer.cs">
     570      <AutoGen>True</AutoGen>
     571      <DesignTime>True</DesignTime>
     572      <DependentUpon>ScriptSources.resx</DependentUpon>
     573    </Compile>
    525574    <Compile Include="HeuristicLab.Scripting-3.3\ScriptingUtils.cs" />
    526     <Compile Include="HeuristicLab.Scripting-3.3\Scripts\GUIAutomationScriptTest.cs" />
    527     <Compile Include="HeuristicLab.Scripting-3.3\Scripts\OSGARastriginScriptTest.cs" />
     575    <Compile Include="HeuristicLab.Scripting-3.3\GUIAutomationScriptTest.cs" />
     576    <Compile Include="HeuristicLab.Scripting-3.3\OSGARastriginScriptTest.cs" />
    528577    <Compile Include="Properties\AssemblyInfo.cs" />
    529     <Compile Include="Test Resources\Script Sources\GridSearch_RF_Classification_Script.cs">
    530       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    531     </Compile>
    532     <Compile Include="Test Resources\Script Sources\GridSearch_RF_Regression_Script.cs">
    533       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    534     </Compile>
    535     <Compile Include="Test Resources\Script Sources\GridSearch_SVM_Classification_Script.cs">
    536       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    537     </Compile>
    538     <Compile Include="Test Resources\Script Sources\GridSearch_SVM_Regression_Script.cs">
    539       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    540     </Compile>
    541     <Compile Include="Test Resources\Script Sources\GA_QAP_Script.cs">
    542       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    543     </Compile>
    544     <Compile Include="Test Resources\Script Sources\OSGA_Rastrigin_Script.cs">
    545       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    546     </Compile>
    547     <Compile Include="Test Resources\Script Sources\GUI_Automation_Script.cs">
     578    <Compile Include="HeuristicLab.Scripting-3.3\Script Sources\GridSearchRFClassificationScriptSource.cs">
     579      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     580    </Compile>
     581    <Compile Include="HeuristicLab.Scripting-3.3\Script Sources\GridSearchRFRegressionScriptSource.cs">
     582      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     583    </Compile>
     584    <Compile Include="HeuristicLab.Scripting-3.3\Script Sources\GridSearchSVMClassificationScriptSource.cs">
     585      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     586    </Compile>
     587    <Compile Include="HeuristicLab.Scripting-3.3\Script Sources\GridSearchSVMRegressionScriptSource.cs">
     588      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     589    </Compile>
     590    <Compile Include="HeuristicLab.Scripting-3.3\Script Sources\GAQAPScriptSource.cs">
     591      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     592    </Compile>
     593    <Compile Include="HeuristicLab.Scripting-3.3\Script Sources\OSGARastriginScriptSource.cs">
     594      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     595    </Compile>
     596    <Compile Include="HeuristicLab.Scripting-3.3\Script Sources\GUIAutomationScriptSource.cs">
    548597      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    549598    </Compile>
    … …  
    588637    </Content>
    589638  </ItemGroup>
    590   <ItemGroup />
     639  <ItemGroup>
     640    <EmbeddedResource Include="HeuristicLab.Scripting-3.3\Script Sources\ScriptSources.resx">
     641      <Generator>ResXFileCodeGenerator</Generator>
     642      <LastGenOutput>ScriptSources.Designer.cs</LastGenOutput>
     643      <CustomToolNamespace>HeuristicLab.Tests</CustomToolNamespace>
     644    </EmbeddedResource>
     645  </ItemGroup>
    591646  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
    592647  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Note: See TracChangeset for help on using the changeset viewer.