Changeset 8019 for trunk/sources
- Timestamp:
- 06/17/12 15:05:11 (13 years ago)
- Location:
- trunk/sources
- Files:
-
- 14 edited
- 19 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab.Encodings.IntegerVectorEncoding
-
Property
svn:mergeinfo
set to
/branches/IntegerVectorEncoding/HeuristicLab.Encodings.IntegerVectorEncoding merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/sources/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/Creators/UniformRandomIntegerVectorCreator.cs
r7259 r8019 49 49 /// <param name="max">The maximum value of the sampling range for each vector element (exclusive).</param> 50 50 /// <returns>The newly created integer vector.</returns> 51 public static IntegerVector Apply(IRandom random, int length, int min, int max) { 52 int[] result = new int[length]; 53 for (int i = 0; i < length; i++) 54 result[i] = random.Next(min, max); 55 return new IntegerVector(result); 51 public static IntegerVector Apply(IRandom random, int length, IntMatrix bounds) { 52 var result = new IntegerVector(length); 53 result.Randomize(random, bounds); 54 return result; 56 55 } 57 56 … … 61 60 /// <param name="random">The pseudo random number generator to use.</param> 62 61 /// <param name="length">The length of the int vector.</param> 63 /// <param name="minimum">The minimum value of the sampling range for each vector element (inclusive).</param> 64 /// <param name="maximum">The maximum value of the sampling range for each vector element (exclusive).</param> 62 /// <param name="bounds">Contains in each row for each dimension minimum (inclusive), maximum (inclusive), and step size.</param> 65 63 /// <returns>The newly created int vector.</returns> 66 protected override IntegerVector Create(IRandom random, IntValue length, Int Value minimum, IntValue maximum) {67 return Apply(random, length.Value, minimum.Value, maximum.Value);64 protected override IntegerVector Create(IRandom random, IntValue length, IntMatrix bounds) { 65 return Apply(random, length.Value, bounds); 68 66 } 69 67 } -
trunk/sources/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/Crossovers/DiscreteCrossover.cs
r7259 r8019 45 45 46 46 /// <summary> 47 /// Performs a discrete crossover operation of the twogiven parents.47 /// Performs a discrete crossover operation of any number of given parents. 48 48 /// </summary> 49 49 /// <exception cref="ArgumentException">Thrown when the vectors of the parents are of different length.</exception> 50 50 /// <param name="random">A random number generator.</param> 51 /// <param name="parent1">The first parent for the crossover operation.</param> 52 /// <param name="parent2">The second parent for the crossover operation.</param> 51 /// <param name="parents">The list of parents for the crossover operation.</param> 53 52 /// <returns>The newly created integer vector, resulting from the crossover operation.</returns> 54 public static IntegerVector Apply(IRandom random, IntegerVector parent1, IntegerVector parent2) { 55 if (parent1.Length != parent2.Length) 56 throw new ArgumentException("DiscreteCrossover: The parents are of different length."); 53 public static IntegerVector Apply(IRandom random, ItemArray<IntegerVector> parents) { 54 int length = parents[0].Length; 57 55 58 int length = parent1.Length; 59 int[] result = new int[length]; 56 for (int i = 0; i < parents.Length; i++) { 57 if (parents[i].Length != length) 58 throw new ArgumentException("DiscreteCrossover: The parents' vectors are of different length.", "parents"); 59 } 60 60 61 var result = new IntegerVector(length); 61 62 for (int i = 0; i < length; i++) { 62 if (random.NextDouble() < 0.5) 63 result[i] = parent1[i]; 64 else 65 result[i] = parent2[i]; 63 result[i] = parents[random.Next(parents.Length)][i]; 66 64 } 67 return new IntegerVector(result); 65 66 return result; 68 67 } 69 68 70 69 /// <summary> 71 /// Performs a discrete crossover operation for twogiven parent integer vectors.70 /// Performs a discrete crossover operation for any number of given parent integer vectors. 72 71 /// </summary> 73 /// <exception cref="ArgumentException">Thrown if there are not exactly two parents.</exception>74 72 /// <param name="random">A random number generator.</param> 75 /// <param name="parents">An array containing the twointeger vectors that should be crossed.</param>73 /// <param name="parents">An array containing integer vectors that should be crossed.</param> 76 74 /// <returns>The newly created integer vector, resulting from the crossover operation.</returns> 77 75 protected override IntegerVector Cross(IRandom random, ItemArray<IntegerVector> parents) { 78 if (parents.Length != 2) throw new ArgumentException("ERROR in DiscreteCrossover: The number of parents is not equal to 2"); 79 return Apply(random, parents[0], parents[1]); 76 return Apply(random, parents); 80 77 } 81 78 } -
trunk/sources/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/Crossovers/MultiIntegerVectorCrossover.cs
r7259 r8019 25 25 using HeuristicLab.Common; 26 26 using HeuristicLab.Core; 27 using HeuristicLab.Data; 27 28 using HeuristicLab.Operators; 28 29 using HeuristicLab.Optimization; … … 34 35 [Item("MultiIntegerVectorCrossover", "Randomly selects and applies one of its crossovers every time it is called.")] 35 36 [StorableClass] 36 public class MultiIntegerVectorCrossover : StochasticMultiBranch<IIntegerVectorCrossover>, IIntegerVectorCrossover, IStochasticOperator {37 public class MultiIntegerVectorCrossover : StochasticMultiBranch<IIntegerVectorCrossover>, IIntegerVectorCrossover, IStochasticOperator, IBoundedIntegerVectorOperator { 37 38 public override bool CanChangeName { 38 39 get { return false; } … … 40 41 protected override bool CreateChildOperation { 41 42 get { return true; } 43 } 44 45 public IValueLookupParameter<IntMatrix> BoundsParameter { 46 get { return (IValueLookupParameter<IntMatrix>)Parameters["Bounds"]; } 42 47 } 43 48 … … 55 60 public MultiIntegerVectorCrossover() 56 61 : base() { 62 Parameters.Add(new ValueLookupParameter<IntMatrix>("Bounds", "The bounds matrix can contain one row for each dimension with three columns specifying minimum (inclusive), maximum (exclusive), and step size. If less rows are given the matrix is cycled.")); 57 63 Parameters.Add(new ScopeTreeLookupParameter<IntegerVector>("Parents", "The parent integer vector which should be crossed.")); 58 64 ParentsParameter.ActualName = "IntegerVector"; … … 88 94 crossover.RandomParameter.ActualName = RandomParameter.Name; 89 95 } 96 foreach (IBoundedIntegerVectorOperator crossover in Operators.OfType<IBoundedIntegerVectorOperator>()) { 97 crossover.BoundsParameter.ActualName = BoundsParameter.Name; 98 } 90 99 } 91 100 -
trunk/sources/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/Crossovers/SinglePointCrossover.cs
r7259 r8019 54 54 public static IntegerVector Apply(IRandom random, IntegerVector parent1, IntegerVector parent2) { 55 55 if (parent1.Length != parent2.Length) 56 throw new ArgumentException(" DiscreteCrossover: The parents are of different length.");56 throw new ArgumentException("SinglePointCrossover: The parents are of different length."); 57 57 58 58 int length = parent1.Length; -
trunk/sources/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/HeuristicLab.Encodings.IntegerVectorEncoding-3.3.csproj
r6866 r8019 41 41 <DebugType>full</DebugType> 42 42 <Optimize>false</Optimize> 43 <OutputPath> $(SolutionDir)\bin\</OutputPath>43 <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath> 44 44 <DefineConstants>DEBUG;TRACE</DefineConstants> 45 45 <ErrorReport>prompt</ErrorReport> … … 50 50 <DebugType>pdbonly</DebugType> 51 51 <Optimize>true</Optimize> 52 <OutputPath> $(SolutionDir)\bin\</OutputPath>52 <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath> 53 53 <DefineConstants>TRACE</DefineConstants> 54 54 <ErrorReport>prompt</ErrorReport> … … 58 58 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' "> 59 59 <DebugSymbols>true</DebugSymbols> 60 <OutputPath> $(SolutionDir)\bin\</OutputPath>60 <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath> 61 61 <DefineConstants>DEBUG;TRACE</DefineConstants> 62 62 <DebugType>full</DebugType> … … 66 66 </PropertyGroup> 67 67 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' "> 68 <OutputPath> $(SolutionDir)\bin\</OutputPath>68 <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath> 69 69 <DefineConstants>TRACE</DefineConstants> 70 70 <Optimize>true</Optimize> … … 76 76 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> 77 77 <DebugSymbols>true</DebugSymbols> 78 <OutputPath> $(SolutionDir)\bin\</OutputPath>78 <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath> 79 79 <DefineConstants>DEBUG;TRACE</DefineConstants> 80 80 <DebugType>full</DebugType> … … 84 84 </PropertyGroup> 85 85 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> 86 <OutputPath> $(SolutionDir)\bin\</OutputPath>86 <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath> 87 87 <DefineConstants>TRACE</DefineConstants> 88 88 <Optimize>true</Optimize> … … 93 93 </PropertyGroup> 94 94 <ItemGroup> 95 <Reference Include="HeuristicLab.Collections-3.3"> 96 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath> 97 <Private>False</Private> 98 </Reference> 99 <Reference Include="HeuristicLab.Common-3.3"> 100 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath> 101 <Private>False</Private> 102 </Reference> 103 <Reference Include="HeuristicLab.Core-3.3"> 104 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath> 105 <Private>False</Private> 106 </Reference> 107 <Reference Include="HeuristicLab.Data-3.3"> 108 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath> 109 <Private>False</Private> 110 </Reference> 111 <Reference Include="HeuristicLab.Operators-3.3"> 112 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath> 113 <Private>False</Private> 114 </Reference> 115 <Reference Include="HeuristicLab.Optimization-3.3"> 116 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath> 117 <Private>False</Private> 118 </Reference> 119 <Reference Include="HeuristicLab.Optimization.Operators-3.3"> 120 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization.Operators-3.3.dll</HintPath> 121 <Private>False</Private> 122 </Reference> 123 <Reference Include="HeuristicLab.Parameters-3.3"> 124 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath> 125 <Private>False</Private> 126 </Reference> 127 <Reference Include="HeuristicLab.Persistence-3.3"> 128 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath> 129 <Private>False</Private> 130 </Reference> 131 <Reference Include="HeuristicLab.PluginInfrastructure-3.3"> 132 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath> 133 <Private>False</Private> 134 </Reference> 135 <Reference Include="HeuristicLab.Random-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 136 <SpecificVersion>False</SpecificVersion> 137 <Private>False</Private> 138 </Reference> 95 139 <Reference Include="System" /> 96 140 <Reference Include="System.Core"> … … 106 150 </ItemGroup> 107 151 <ItemGroup> 152 <Compile Include="BoundedIntegerVectorCrossover.cs" /> 153 <Compile Include="BoundedIntegerVectorManipulator.cs" /> 108 154 <Compile Include="Creators\UniformRandomIntegerVectorCreator.cs" /> 155 <Compile Include="Crossovers\RoundedAverageCrossover.cs" /> 109 156 <Compile Include="Crossovers\DiscreteCrossover.cs"> 110 157 <SubType>Code</SubType> 111 158 </Compile> 112 159 <Compile Include="Crossovers\MultiIntegerVectorCrossover.cs" /> 160 <Compile Include="Crossovers\RoundedBlendAlphaBetaCrossover.cs" /> 161 <Compile Include="Crossovers\RoundedBlendAlphaCrossover.cs" /> 162 <Compile Include="Crossovers\RoundedHeuristicCrossover.cs" /> 163 <Compile Include="Crossovers\RoundedLocalCrossover.cs" /> 113 164 <Compile Include="Crossovers\SinglePointCrossover.cs"> 114 165 <SubType>Code</SubType> 115 166 </Compile> 167 <Compile Include="Crossovers\RoundedUniformArithmeticCrossover.cs" /> 168 <Compile Include="Interfaces\IBoundedIntegerVectorOperator.cs" /> 116 169 <Compile Include="Interfaces\IIntegerVectorCreator.cs" /> 117 170 <Compile Include="Interfaces\IIntegerVectorCrossover.cs" /> … … 121 174 <Compile Include="IntegerVectorCrossover.cs" /> 122 175 <Compile Include="IntegerVectorManipulator.cs" /> 176 <Compile Include="Interfaces\IIntegerVectorStdDevStrategyParameterCreator.cs" /> 177 <Compile Include="Interfaces\IIntegerVectorStdDevStrategyParameterCrossover.cs" /> 178 <Compile Include="Interfaces\IIntegerVectorStdDevStrategyParameterManipulator.cs" /> 179 <Compile Include="Interfaces\IIntegerVectorStdDevStrategyParameterOperator.cs" /> 180 <Compile Include="Manipulators\UniformSomePositionsManipulator.cs" /> 181 <Compile Include="Manipulators\RoundedNormalAllPositionsManipulator.cs" /> 182 <Compile Include="Manipulators\SelfAdaptiveRoundedNormalAllPositionsManipulator.cs" /> 183 <Compile Include="Manipulators\StdDevStrategyVectorCreator.cs" /> 184 <Compile Include="Manipulators\StdDevStrategyVectorCrossover.cs" /> 185 <Compile Include="Manipulators\StdDevStrategyVectorManipulator.cs" /> 123 186 <Compile Include="Manipulators\UniformOnePositionManipulator.cs"> 124 187 <SubType>Code</SubType> … … 129 192 <Compile Include="IntegerVectorCreator.cs" /> 130 193 <Compile Include="ShakingOperators\IntegerVectorShakingOperator.cs" /> 131 </ItemGroup>132 <ItemGroup>133 <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">134 <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>135 <Name>HeuristicLab.Collections-3.3</Name>136 <Private>False</Private>137 </ProjectReference>138 <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">139 <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>140 <Name>HeuristicLab.Common-3.3</Name>141 <Private>False</Private>142 </ProjectReference>143 <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">144 <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>145 <Name>HeuristicLab.Core-3.3</Name>146 <Private>False</Private>147 </ProjectReference>148 <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">149 <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>150 <Name>HeuristicLab.Data-3.3</Name>151 <Private>False</Private>152 </ProjectReference>153 <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">154 <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>155 <Name>HeuristicLab.Operators-3.3</Name>156 <Private>False</Private>157 </ProjectReference>158 <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">159 <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>160 <Name>HeuristicLab.Optimization.Operators-3.3</Name>161 <Private>False</Private>162 </ProjectReference>163 <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">164 <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>165 <Name>HeuristicLab.Optimization-3.3</Name>166 <Private>False</Private>167 </ProjectReference>168 <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">169 <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>170 <Name>HeuristicLab.Parameters-3.3</Name>171 <Private>False</Private>172 </ProjectReference>173 <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">174 <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>175 <Name>HeuristicLab.Persistence-3.3</Name>176 <Private>False</Private>177 </ProjectReference>178 <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">179 <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>180 <Name>HeuristicLab.PluginInfrastructure-3.3</Name>181 <Private>False</Private>182 </ProjectReference>183 194 </ItemGroup> 184 195 <ItemGroup> -
trunk/sources/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/IntegerVector.cs
r7259 r8019 20 20 #endregion 21 21 22 using System; 22 23 using HeuristicLab.Common; 23 24 using HeuristicLab.Core; … … 49 50 } 50 51 51 public virtual void Randomize(IRandom random, int startIndex, int length, int min, int max ) {52 public virtual void Randomize(IRandom random, int startIndex, int length, int min, int max, int step = 1) { 52 53 if (length > 0) { 53 for (int i = 0; i < length; i++) 54 array[startIndex + i] = random.Next(min, max); 54 int numbers = (int)Math.Floor((max - min) / (double)step); 55 for (int i = startIndex; i < startIndex + length; i++) { 56 array[i] = random.Next(numbers) * step + min; 57 } 55 58 OnReset(); 56 59 } 57 60 } 58 public void Randomize(IRandom random, int min, int max) { 59 Randomize(random, 0, Length, min, max); 61 public virtual void Randomize(IRandom random, int startIndex, int length, IntMatrix bounds) { 62 if (length > 0) { 63 for (int i = startIndex; i < startIndex + length; i++) { 64 int min = bounds[i % bounds.Rows, 0], max = bounds[i % bounds.Rows, 1], step = 1; 65 if (bounds.Columns > 2) step = bounds[i % bounds.Rows, 2]; 66 int numbers = (int)Math.Floor((max - min) / (double)step); 67 array[i] = random.Next(numbers) * step + min; 68 } 69 OnReset(); 70 } 71 } 72 public void Randomize(IRandom random, int min, int max, int step = 1) { 73 Randomize(random, 0, Length, min, max, step); 74 } 75 public void Randomize(IRandom random, IntMatrix bounds) { 76 Randomize(random, 0, Length, bounds); 60 77 } 61 78 } -
trunk/sources/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/IntegerVectorCreator.cs
r7259 r8019 47 47 get { return (IValueLookupParameter<IntValue>)Parameters["Length"]; } 48 48 } 49 public IValueLookupParameter<IntValue> MinimumParameter { 50 get { return (IValueLookupParameter<IntValue>)Parameters["Minimum"]; } 51 } 52 public IValueLookupParameter<IntValue> MaximumParameter { 53 get { return (IValueLookupParameter<IntValue>)Parameters["Maximum"]; } 49 public IValueLookupParameter<IntMatrix> BoundsParameter { 50 get { return (IValueLookupParameter<IntMatrix>)Parameters["Bounds"]; } 54 51 } 55 52 … … 62 59 Parameters.Add(new LookupParameter<IntegerVector>("IntegerVector", "The vector which should be manipulated.")); 63 60 Parameters.Add(new ValueLookupParameter<IntValue>("Length", "The length of the vector.")); 64 Parameters.Add(new ValueLookupParameter<IntValue>("Minimum", "The inclusive lower bound for each element in the vector.")); 65 Parameters.Add(new ValueLookupParameter<IntValue>("Maximum", "The exclusive upper bound for each element in the vector.")); 61 Parameters.Add(new ValueLookupParameter<IntMatrix>("Bounds", "The bounds matrix can contain one row for each dimension with three columns specifying minimum (inclusive), maximum (exclusive), and step size. If less rows are given the matrix is cycled.")); 66 62 } 67 63 64 // BackwardsCompatibility3.3 65 #region Backwards compatible code, remove with 3.4 66 [StorableHook(HookType.AfterDeserialization)] 67 private void AfterDeserialization() { 68 if (!Parameters.ContainsKey("Bounds")) { 69 var min = ((IValueLookupParameter<IntValue>)Parameters["Minimum"]).Value as IntValue; 70 var max = ((IValueLookupParameter<IntValue>)Parameters["Maximum"]).Value as IntValue; 71 Parameters.Remove("Minimum"); 72 Parameters.Remove("Maximum"); 73 Parameters.Add(new ValueLookupParameter<IntMatrix>("Bounds", "The bounds matrix can contain one row for each dimension with three columns specifying minimum (inclusive), maximum (exclusive), and step size. If less rows are given the matrix is cycled.")); 74 if (min != null && max != null) { 75 BoundsParameter.Value = new IntMatrix(new int[,] { { min.Value, max.Value, 1 } }); 76 } 77 } 78 } 79 #endregion 80 68 81 public sealed override IOperation Apply() { 69 IntegerVectorParameter.ActualValue = Create(RandomParameter.ActualValue, LengthParameter.ActualValue, MinimumParameter.ActualValue, MaximumParameter.ActualValue);82 IntegerVectorParameter.ActualValue = Create(RandomParameter.ActualValue, LengthParameter.ActualValue, BoundsParameter.ActualValue); 70 83 return base.Apply(); 71 84 } 72 85 73 protected abstract IntegerVector Create(IRandom random, IntValue length, Int Value minimum, IntValue maximum);86 protected abstract IntegerVector Create(IRandom random, IntValue length, IntMatrix bounds); 74 87 } 75 88 } -
trunk/sources/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/Interfaces/IIntegerVectorCreator.cs
r7259 r8019 28 28 /// An interface which represents an operator for creating vectors of int-valued data. 29 29 /// </summary> 30 public interface IIntegerVectorCreator : I IntegerVectorOperator, ISolutionCreator {30 public interface IIntegerVectorCreator : ISolutionCreator, IBoundedIntegerVectorOperator { 31 31 IValueLookupParameter<IntValue> LengthParameter { get; } 32 IValueLookupParameter<IntValue> MinimumParameter { get; }33 IValueLookupParameter<IntValue> MaximumParameter { get; }34 32 ILookupParameter<IntegerVector> IntegerVectorParameter { get; } 35 33 } -
trunk/sources/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/Manipulators/UniformOnePositionManipulator.cs
r7259 r8019 36 36 [Item("UniformOnePositionManipulator", " Uniformly distributed change of a single position of an integer vector. It is implemented as described in Michalewicz, Z. 1999. Genetic Algorithms + Data Structures = Evolution Programs. Third, Revised and Extended Edition, Spring-Verlag Berlin Heidelberg.")] 37 37 [StorableClass] 38 public class UniformOnePositionManipulator : IntegerVectorManipulator { 39 /// <summary> 40 /// The lower bound of the values in the int vector. 41 /// </summary> 42 public ValueLookupParameter<IntValue> MinimumParameter { 43 get { return (ValueLookupParameter<IntValue>)Parameters["Minimum"]; } 44 } 45 /// <summary> 46 /// The upper bound of the values in the int vector. 47 /// </summary> 48 public ValueLookupParameter<IntValue> MaximumParameter { 49 get { return (ValueLookupParameter<IntValue>)Parameters["Maximum"]; } 50 } 38 public class UniformOnePositionManipulator : BoundedIntegerVectorManipulator { 51 39 52 40 [StorableConstructor] … … 57 45 /// (<c>Minimum</c> and <c>Maximum</c>). 58 46 /// </summary> 59 public UniformOnePositionManipulator() 60 : base() { 61 Parameters.Add(new ValueLookupParameter<IntValue>("Minimum", "Minimum of the sampling range for the vector element (included)")); 62 Parameters.Add(new ValueLookupParameter<IntValue>("Maximum", "Maximum of the sampling range for the vector element (excluded)")); 63 } 47 public UniformOnePositionManipulator() : base() { } 64 48 65 49 public override IDeepCloneable Clone(Cloner cloner) { 66 50 return new UniformOnePositionManipulator(this, cloner); 67 51 } 52 53 // BackwardsCompatibility3.3 54 #region Backwards compatible code, remove with 3.4 55 [StorableHook(HookType.AfterDeserialization)] 56 private void AfterDeserialization() { 57 if (!Parameters.ContainsKey("Bounds")) { 58 var min = ((IValueLookupParameter<IntValue>)Parameters["Minimum"]).Value as IntValue; 59 var max = ((IValueLookupParameter<IntValue>)Parameters["Maximum"]).Value as IntValue; 60 Parameters.Remove("Minimum"); 61 Parameters.Remove("Maximum"); 62 Parameters.Add(new ValueLookupParameter<IntMatrix>("Bounds", "The bounds matrix can contain one row for each dimension with three columns specifying minimum (inclusive), maximum (exclusive), and step size. If less rows are given the matrix is cycled.")); 63 if (min != null && max != null) { 64 BoundsParameter.Value = new IntMatrix(new int[,] { { min.Value, max.Value, 1 } }); 65 } 66 } 67 } 68 #endregion 68 69 69 70 /// <summary> … … 76 77 /// <param name="max">The maximum value of the sampling range for 77 78 /// the vector element to change (exclusive).</param> 78 public static void Apply(IRandom random, IntegerVector vector, IntValue min, IntValue max) { 79 int index = random.Next(vector.Length); 80 vector[index] = random.Next(min.Value, max.Value); 79 /// <param name="bounds">The bounds and step size for each dimension (will be cycled in case there are less rows than elements in the parent vectors).</param> 80 public static void Apply(IRandom random, IntegerVector vector, IntMatrix bounds) { 81 Manipulate(random, vector, bounds, random.Next(vector.Length)); 82 } 83 84 public static void Manipulate(IRandom random, IntegerVector vector, IntMatrix bounds, int index) { 85 if (bounds == null || bounds.Rows == 0 || bounds.Columns < 2) throw new ArgumentException("UniformOnePositionManipulator: Invalid bounds specified", "bounds"); 86 int min = bounds[index % bounds.Rows, 0], max = bounds[index % bounds.Rows, 1], step = 1; 87 if (bounds.Columns > 2) step = bounds[index % bounds.Rows, 2]; 88 vector[index] = RoundFeasible(min, max, step, random.Next(min, max + 1)); 81 89 } 82 90 … … 87 95 /// <param name="random">A random number generator.</param> 88 96 /// <param name="vector">The integer vector to manipulate.</param> 89 protected override void Manipulate(IRandom random, IntegerVector vector) {90 if (MinimumParameter.ActualValue == null) throw new InvalidOperationException("UniformOnePositionManipulator: Parameter " + MinimumParameter.ActualName + " could not be found.");91 if ( MaximumParameter.ActualValue == null) throw new InvalidOperationException("UniformOnePositionManipulator: Parameter " + MaximumParameter.ActualName + " could not be found.");92 Apply(random, vector, MinimumParameter.ActualValue, MaximumParameter.ActualValue);97 /// <param name="bounds">The bounds and step size for each dimension (will be cycled in case there are less rows than elements in the parent vectors).</param> 98 protected override void ManipulateBounded(IRandom random, IntegerVector vector, IntMatrix bounds) { 99 if (BoundsParameter.ActualValue == null) throw new InvalidOperationException("UniformOnePositionManipulator: Parameter " + BoundsParameter.ActualName + " could not be found."); 100 Apply(random, vector, bounds); 93 101 } 94 102 } -
trunk/sources/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/Plugin.cs.frame
r7259 r8019 37 37 [PluginDependency("HeuristicLab.Parameters", "3.3")] 38 38 [PluginDependency("HeuristicLab.Persistence", "3.3")] 39 [PluginDependency("HeuristicLab.Random", "3.3")] 39 40 public class HeuristicLabEncodingsIntegerVectorEncodingPlugin : PluginBase { 40 41 } -
trunk/sources/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/ShakingOperators/IntegerVectorShakingOperator.cs
r7259 r8019 58 58 Parameters.Add(new LookupParameter<IRandom>("Random", "The random number generator that will be used for stochastic shaking operators.")); 59 59 foreach (IIntegerVectorManipulator shaker in ApplicationManager.Manager.GetInstances<IIntegerVectorManipulator>().OrderBy(x => x.Name)) 60 Operators.Add(shaker);60 if (!(shaker is ISelfAdaptiveManipulator)) Operators.Add(shaker); 61 61 } 62 62 -
trunk/sources/HeuristicLab.Tests/HeuristicLab.Encodings.IntegerVectorEncoding-3.3/DiscreteCrossoverTest.cs
r7259 r8019 119 119 parent2 = new IntegerVector(new int[] { 4, 1, 3, 2, 8 }); 120 120 expected = new IntegerVector(new int[] { 2, 2, 3, 5, 8 }); 121 actual = DiscreteCrossover.Apply(random, parent1, parent2);121 actual = DiscreteCrossover.Apply(random, new ItemArray<IntegerVector>(new IntegerVector[] { parent1, parent2 })); 122 122 Assert.IsTrue(Auxiliary.IntegerVectorIsEqualByPosition(actual, expected)); 123 123 … … 129 129 exceptionFired = false; 130 130 try { 131 actual = DiscreteCrossover.Apply(random, parent1, parent2);131 actual = DiscreteCrossover.Apply(random, new ItemArray<IntegerVector>(new IntegerVector[] { parent1, parent2 })); 132 132 } 133 133 catch (System.ArgumentException) { -
trunk/sources/HeuristicLab.Tests/HeuristicLab.Encodings.IntegerVectorEncoding-3.3/UniformOnePositionManipulatorTest.cs
r7259 r8019 87 87 TestRandom random = new TestRandom(); 88 88 IntegerVector parent, expected; 89 Int Value min, max;89 IntMatrix bounds = new IntMatrix(1, 2); 90 90 // The following test is not based on published examples 91 91 random.Reset(); … … 93 93 parent = new IntegerVector(new int[] { 2, 2, 3, 5, 1 }); 94 94 expected = new IntegerVector(new int[] { 2, 2, 3, 3, 1 }); 95 min = new IntValue(2);96 max = new IntValue(7);97 UniformOnePositionManipulator.Apply(random, parent, min, max);95 bounds[0, 0] = 2; 96 bounds[0, 1] = 7; 97 UniformOnePositionManipulator.Apply(random, parent, bounds); 98 98 Assert.IsTrue(Auxiliary.IntegerVectorIsEqualByPosition(expected, parent)); 99 99 }
Note: See TracChangeset
for help on using the changeset viewer.