- Timestamp:
- 03/15/11 10:55:15 (13 years ago)
- Location:
- trunk/sources
- Files:
-
- 6 edited
- 2 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources
- Property svn:mergeinfo changed
/branches/SuccessProgressAnalysis (added) merged: 5370,5372,5379,5492-5493,5682
- Property svn:mergeinfo changed
-
trunk/sources/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm-3.3.csproj
r5163 r5683 12 12 <AssemblyName>HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm-3.3</AssemblyName> 13 13 <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> 14 <TargetFrameworkProfile></TargetFrameworkProfile> 14 <TargetFrameworkProfile> 15 </TargetFrameworkProfile> 15 16 <FileAlignment>512</FileAlignment> 16 17 <SignAssembly>true</SignAssembly> … … 115 116 <Compile Include="OffspringSelectionGeneticAlgorithmMainOperator.cs" /> 116 117 <Compile Include="Properties\AssemblyInfo.cs" /> 118 <Compile Include="SuccessfulOffspringAnalysis\SuccessfulOffspringAnalyzer.cs" /> 117 119 </ItemGroup> 118 120 <ItemGroup> -
trunk/sources/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/IslandOffspringSelectionGeneticAlgorithm.cs
r5445 r5683 249 249 [Storable] 250 250 private ValueAnalyzer selectionPressureAnalyzer; 251 [Storable] 252 private SuccessfulOffspringAnalyzer successfulOffspringAnalyzer; 251 253 #endregion 252 254 … … 255 257 [StorableHook(HookType.AfterDeserialization)] 256 258 private void AfterDeserialization() { 259 #region Backwards Compatibility 260 if (successfulOffspringAnalyzer == null) 261 successfulOffspringAnalyzer = new SuccessfulOffspringAnalyzer(); 262 #endregion 263 257 264 Initialize(); 258 265 } … … 263 270 islandSelectionPressureAnalyzer = cloner.Clone(original.islandSelectionPressureAnalyzer); 264 271 selectionPressureAnalyzer = cloner.Clone(original.selectionPressureAnalyzer); 272 successfulOffspringAnalyzer = cloner.Clone(original.successfulOffspringAnalyzer); 265 273 Initialize(); 266 274 } … … 386 394 selectionPressureAnalyzer = new ValueAnalyzer(); 387 395 islandSelectionPressureAnalyzer = new ValueAnalyzer(); 396 successfulOffspringAnalyzer = new SuccessfulOffspringAnalyzer(); 388 397 ParameterizeAnalyzers(); 389 398 UpdateAnalyzers(); … … 554 563 selectionPressureAnalyzer.ValuesParameter.ActualName = "Selection Pressure History"; 555 564 565 successfulOffspringAnalyzer.ResultsParameter.ActualName = "Results"; 566 successfulOffspringAnalyzer.GenerationsParameter.ActualName = "Generations"; 567 successfulOffspringAnalyzer.SuccessfulOffspringFlag.Value.Value = "SuccessfulOffspring"; 568 successfulOffspringAnalyzer.DepthParameter.Value = new IntValue(2); 569 556 570 if (Problem != null) { 557 571 islandQualityAnalyzer.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name; … … 616 630 Analyzer.Operators.Add(qualityAnalyzer); 617 631 Analyzer.Operators.Add(selectionPressureAnalyzer); 632 Analyzer.Operators.Add(successfulOffspringAnalyzer); 633 Analyzer.Operators.SetItemCheckedState(successfulOffspringAnalyzer, false); 618 634 } 619 635 private IslandOffspringSelectionGeneticAlgorithmMainLoop FindMainLoop(IOperator start) { -
trunk/sources/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithm.cs
r5445 r5683 197 197 [Storable] 198 198 private ValueAnalyzer selectionPressureAnalyzer; 199 [Storable] 200 private SuccessfulOffspringAnalyzer successfulOffspringAnalyzer; 199 201 #endregion 200 202 … … 203 205 [StorableHook(HookType.AfterDeserialization)] 204 206 private void AfterDeserialization() { 207 #region Backwards Compatibility 208 if (successfulOffspringAnalyzer == null) 209 successfulOffspringAnalyzer = new SuccessfulOffspringAnalyzer(); 210 #endregion 211 205 212 Initialize(); 206 213 } … … 209 216 qualityAnalyzer = cloner.Clone(original.qualityAnalyzer); 210 217 selectionPressureAnalyzer = cloner.Clone(original.selectionPressureAnalyzer); 218 successfulOffspringAnalyzer = cloner.Clone(original.successfulOffspringAnalyzer); 211 219 Initialize(); 212 220 } … … 291 299 qualityAnalyzer = new BestAverageWorstQualityAnalyzer(); 292 300 selectionPressureAnalyzer = new ValueAnalyzer(); 301 successfulOffspringAnalyzer = new SuccessfulOffspringAnalyzer(); 293 302 ParameterizeAnalyzers(); 294 303 UpdateAnalyzers(); … … 407 416 selectionPressureAnalyzer.ValueParameter.Depth = 0; 408 417 selectionPressureAnalyzer.ValuesParameter.ActualName = "Selection Pressure History"; 418 successfulOffspringAnalyzer.ResultsParameter.ActualName = "Results"; 419 successfulOffspringAnalyzer.GenerationsParameter.ActualName = "Generations"; 420 successfulOffspringAnalyzer.SuccessfulOffspringFlag.Value.Value = "SuccessfulOffspring"; 421 successfulOffspringAnalyzer.DepthParameter.Value = new IntValue(1); 409 422 if (Problem != null) { 410 423 qualityAnalyzer.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name; … … 462 475 Analyzer.Operators.Add(qualityAnalyzer); 463 476 Analyzer.Operators.Add(selectionPressureAnalyzer); 477 Analyzer.Operators.Add(successfulOffspringAnalyzer); 478 Analyzer.Operators.SetItemCheckedState(successfulOffspringAnalyzer, false); 464 479 } 465 480 private OffspringSelectionGeneticAlgorithmMainLoop FindMainLoop(IOperator start) { -
trunk/sources/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/SASEGASA.cs
r5445 r5683 225 225 [Storable] 226 226 private ValueAnalyzer selectionPressureAnalyzer; 227 [Storable] 228 private SuccessfulOffspringAnalyzer successfulOffspringAnalyzer; 227 229 #endregion 228 230 … … 231 233 [StorableHook(HookType.AfterDeserialization)] 232 234 private void AfterDeserialization() { 235 #region Backwards Compatibility 236 if (successfulOffspringAnalyzer == null) 237 successfulOffspringAnalyzer = new SuccessfulOffspringAnalyzer(); 238 #endregion 239 233 240 Initialize(); 234 241 } … … 239 246 selectionPressureAnalyzer = cloner.Clone(original.selectionPressureAnalyzer); 240 247 villageSelectionPressureAnalyzer = cloner.Clone(original.villageSelectionPressureAnalyzer); 248 successfulOffspringAnalyzer = cloner.Clone(original.successfulOffspringAnalyzer); 241 249 Initialize(); 242 250 } … … 344 352 selectionPressureAnalyzer = new ValueAnalyzer(); 345 353 villageSelectionPressureAnalyzer = new ValueAnalyzer(); 354 successfulOffspringAnalyzer = new SuccessfulOffspringAnalyzer(); 346 355 ParameterizeAnalyzers(); 347 356 UpdateAnalyzers(); … … 492 501 selectionPressureAnalyzer.ValuesParameter.ActualName = "Selection Pressure History"; 493 502 503 successfulOffspringAnalyzer.ResultsParameter.ActualName = "Results"; 504 successfulOffspringAnalyzer.GenerationsParameter.ActualName = "Generations"; 505 successfulOffspringAnalyzer.SuccessfulOffspringFlag.Value.Value = "SuccessfulOffspring"; 506 successfulOffspringAnalyzer.DepthParameter.Value = new IntValue(2); 507 494 508 if (Problem != null) { 495 509 villageQualityAnalyzer.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name; … … 554 568 Analyzer.Operators.Add(qualityAnalyzer); 555 569 Analyzer.Operators.Add(selectionPressureAnalyzer); 570 Analyzer.Operators.Add(successfulOffspringAnalyzer); 571 Analyzer.Operators.SetItemCheckedState(successfulOffspringAnalyzer, false); 556 572 } 557 573 private SASEGASAMainLoop FindMainLoop(IOperator start) { -
trunk/sources/HeuristicLab.Operators/3.3/StochasticMultiBranch.cs
r5445 r5683 49 49 get { return (ILookupParameter<IRandom>)Parameters["Random"]; } 50 50 } 51 public ValueParameter<BoolValue> TraceSelectedOperatorParameter { 52 get { return (ValueParameter<BoolValue>)Parameters["TraceSelectedOperator"]; } 53 } 54 public ValueLookupParameter<StringValue> SelectedOperatorParameter { 55 get { return (ValueLookupParameter<StringValue>)Parameters["SelectedOperator"]; } 56 } 51 57 52 58 public DoubleArray Probabilities { 53 59 get { return ProbabilitiesParameter.Value; } 54 60 set { ProbabilitiesParameter.Value = value; } 61 } 62 63 [StorableHook(HookType.AfterDeserialization)] 64 private void AfterDeserializationHook() { 65 #region Backwards Compatibility 66 if (!Parameters.ContainsKey("SelectedOperator")) { 67 Parameters.Add(new ValueLookupParameter<StringValue>("SelectedOperator", "If the TraceSelectedOperator flag is set, the name of the operator is traced in this parameter.")); 68 } 69 if (!Parameters.ContainsKey("TraceSelectedOperator")) { 70 Parameters.Add(new ValueParameter<BoolValue>("TraceSelectedOperator", "Indicates, if the selected operator should be traced.", new BoolValue(false))); 71 } 72 #endregion 55 73 } 56 74 … … 68 86 Parameters.Add(new ValueLookupParameter<DoubleArray>("Probabilities", "The array of relative probabilities for each operator.", new DoubleArray())); 69 87 Parameters.Add(new LookupParameter<IRandom>("Random", "The random number generator to use.")); 88 Parameters.Add(new ValueLookupParameter<StringValue>("SelectedOperator", "If the TraceSelectedOperator flag is set, the name of the operator is traced in this parameter.")); 89 Parameters.Add(new ValueParameter<BoolValue>("TraceSelectedOperator", "Indicates, if the selected operator should be traced.", new BoolValue(false))); 70 90 } 71 91 … … 116 136 } 117 137 IOperator successor = null; 138 int index = -1; 118 139 var checkedOperators = Operators.CheckedItems; 119 140 if (checkedOperators.Count() > 0) { … … 127 148 if (sum > r) { 128 149 successor = indexedItem.Value; 150 index = indexedItem.Index; 129 151 break; 130 152 } … … 133 155 OperationCollection next = new OperationCollection(base.Apply()); 134 156 if (successor != null) { 157 if (TraceSelectedOperatorParameter.Value.Value) 158 SelectedOperatorParameter.ActualValue = new StringValue(index + ": " + successor.Name); 159 135 160 if (CreateChildOperation) 136 161 next.Insert(0, ExecutionContext.CreateChildOperation(successor)); 137 162 else next.Insert(0, ExecutionContext.CreateOperation(successor)); 163 } else { 164 if (TraceSelectedOperatorParameter.Value.Value) 165 SelectedOperatorParameter.ActualValue = new StringValue(""); 138 166 } 139 167 return next;
Note: See TracChangeset
for help on using the changeset viewer.