Changeset 8888


Ignore:
Timestamp:
11/12/12 08:59:18 (10 years ago)
Author:
abeham
Message:

#1329:

  • Fixed failed test case (mutation is now working)
  • Removed TestRandom and used the one in the Tests namespace
  • Corrected namespaces
Location:
trunk/sources
Files:
1 deleted
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Problems.Instances.Scheduling/3.3

    • Property svn:ignore
      •  

        old new  
        22Plugin.cs
        33*.user
         4bin
  • trunk/sources/HeuristicLab.Tests/HeuristicLab.Encodings.ScheduleEncoding-3.3/DirectScheduleGTCrossoverTest.cs

    r8757 r8888  
    1 using HeuristicLab.Core;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21
     22using HeuristicLab.Core;
     23using HeuristicLab.Encodings.ScheduleEncoding;
    224using HeuristicLab.Encodings.ScheduleEncoding.PermutationWithRepetition;
    325using HeuristicLab.Encodings.ScheduleEncoding.ScheduleEncoding;
     26using HeuristicLab.Tests;
    427using Microsoft.VisualStudio.TestTools.UnitTesting;
    528
    6 namespace HeuristicLab.Encodings.ScheduleEncoding.Tests_33.Tests {
     29namespace HeuristicLab.Encodings.ScheduleEncoding_33.Tests {
    730
    831
     
    6689    [TestMethod()]
    6790    public void ApplyTest() {
    68       IRandom random = new TestRandom(new int[] { 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1 }, null);
     91      IRandom random = new TestRandom(new int[] {  1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1 }, new double[] { 0.9, 0.9, 0.9, 0.9, 0.9, 0.9, 0.9, 0.9, 0.9, 0.9, 0.9, 0.9, 0.9, 0.9, 0.9, 0.9, 0.9, 0.9 });
    6992      Schedule parent1 = TestUtils.CreateTestSchedule1();
    7093      Schedule parent2 = TestUtils.CreateTestSchedule2();
  • trunk/sources/HeuristicLab.Tests/HeuristicLab.Encodings.ScheduleEncoding-3.3/JSMJOXCrossoverTest.cs

    r8757 r8888  
    22using HeuristicLab.Encodings.PermutationEncoding;
    33using HeuristicLab.Encodings.ScheduleEncoding.JobSequenceMatrix;
     4using HeuristicLab.Tests;
    45using Microsoft.VisualStudio.TestTools.UnitTesting;
    56
    6 namespace HeuristicLab.Encodings.ScheduleEncoding.Tests_33.Tests {
     7namespace HeuristicLab.Encodings.ScheduleEncoding_33.Tests {
    78
    89
  • trunk/sources/HeuristicLab.Tests/HeuristicLab.Encodings.ScheduleEncoding-3.3/JSMSXXCrossoverTest.cs

    r8757 r8888  
    22using HeuristicLab.Encodings.PermutationEncoding;
    33using HeuristicLab.Encodings.ScheduleEncoding.JobSequenceMatrix;
     4using HeuristicLab.Tests;
    45using Microsoft.VisualStudio.TestTools.UnitTesting;
    56
    6 namespace HeuristicLab.Encodings.ScheduleEncoding.Tests_33.Tests {
     7namespace HeuristicLab.Encodings.ScheduleEncoding_33.Tests {
    78
    89
  • trunk/sources/HeuristicLab.Tests/HeuristicLab.Encodings.ScheduleEncoding-3.3/JSMShiftChangeManipulatorTest.cs

    r8757 r8888  
    22using HeuristicLab.Encodings.PermutationEncoding;
    33using HeuristicLab.Encodings.ScheduleEncoding.JobSequenceMatrix;
     4using HeuristicLab.Tests;
    45using Microsoft.VisualStudio.TestTools.UnitTesting;
    56
    6 namespace HeuristicLab.Encodings.ScheduleEncoding.Tests_33.Tests {
     7namespace HeuristicLab.Encodings.ScheduleEncoding_33.Tests {
    78
    89
  • trunk/sources/HeuristicLab.Tests/HeuristicLab.Encodings.ScheduleEncoding-3.3/PWRGOXCrossoverTest.cs

    r8757 r8888  
    22using HeuristicLab.Encodings.IntegerVectorEncoding;
    33using HeuristicLab.Encodings.ScheduleEncoding.PermutationWithRepetition;
     4using HeuristicLab.Tests;
    45using Microsoft.VisualStudio.TestTools.UnitTesting;
    56
    6 namespace HeuristicLab.Encodings.ScheduleEncoding.Tests_33.Tests {
     7namespace HeuristicLab.Encodings.ScheduleEncoding_33.Tests {
    78
    89
  • trunk/sources/HeuristicLab.Tests/HeuristicLab.Encodings.ScheduleEncoding-3.3/PWRPPXCrossoverTest.cs

    r8757 r8888  
    22using HeuristicLab.Encodings.IntegerVectorEncoding;
    33using HeuristicLab.Encodings.ScheduleEncoding.PermutationWithRepetition;
     4using HeuristicLab.Tests;
    45using Microsoft.VisualStudio.TestTools.UnitTesting;
    56
    6 namespace HeuristicLab.Encodings.ScheduleEncoding.Tests_33.Tests {
     7namespace HeuristicLab.Encodings.ScheduleEncoding_33.Tests {
    78
    89
  • trunk/sources/HeuristicLab.Tests/HeuristicLab.Encodings.ScheduleEncoding-3.3/TestUtils.cs

    r8757 r8888  
    22using HeuristicLab.Encodings.IntegerVectorEncoding;
    33using HeuristicLab.Encodings.PermutationEncoding;
     4using HeuristicLab.Encodings.ScheduleEncoding;
    45using HeuristicLab.Encodings.ScheduleEncoding.JobSequenceMatrix;
    56using HeuristicLab.Encodings.ScheduleEncoding.PermutationWithRepetition;
     7using HeuristicLab.Tests;
    68
    7 namespace HeuristicLab.Encodings.ScheduleEncoding.Tests_33.Tests {
     9namespace HeuristicLab.Encodings.ScheduleEncoding_33.Tests {
    810  public class TestUtils {
    911    public static JSMEncoding CreateTestJSM1() {
  • trunk/sources/HeuristicLab.Tests/HeuristicLab.Tests.csproj

    r8882 r8888  
    368368    <Compile Include="HeuristicLab.Encodings.ScheduleEncoding-3.3\PWRGOXCrossoverTest.cs" />
    369369    <Compile Include="HeuristicLab.Encodings.ScheduleEncoding-3.3\PWRPPXCrossoverTest.cs" />
    370     <Compile Include="HeuristicLab.Encodings.ScheduleEncoding-3.3\TestRandom.cs" />
    371370    <Compile Include="HeuristicLab.Encodings.ScheduleEncoding-3.3\TestUtils.cs" />
    372371    <Compile Include="HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4\AllArchitectureAlteringOperatorsTest.cs" />
Note: See TracChangeset for help on using the changeset viewer.