Changeset 6051 for trunk/sources
- Timestamp:
- 04/26/11 04:10:17 (14 years ago)
- Location:
- trunk/sources
- Files:
-
- 23 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/GeneticAlgorithm.cs
r5809 r6051 305 305 } 306 306 private void ParameterizeStochasticOperator(IOperator op) { 307 if (op is IStochasticOperator) 308 ((IStochasticOperator)op).RandomParameter.ActualName = RandomCreator.RandomParameter.ActualName; 307 IStochasticOperator stochasticOp = op as IStochasticOperator; 308 if (stochasticOp != null) { 309 stochasticOp.RandomParameter.ActualName = RandomCreator.RandomParameter.ActualName; 310 stochasticOp.RandomParameter.Hidden = true; 311 } 309 312 } 310 313 private void ParameterizeSelectors() { … … 312 315 selector.CopySelected = new BoolValue(true); 313 316 selector.NumberOfSelectedSubScopesParameter.Value = new IntValue(2 * (PopulationSizeParameter.Value.Value - ElitesParameter.Value.Value)); 317 selector.NumberOfSelectedSubScopesParameter.Hidden = true; 314 318 ParameterizeStochasticOperator(selector); 315 319 } … … 317 321 foreach (ISingleObjectiveSelector selector in SelectorParameter.ValidValues.OfType<ISingleObjectiveSelector>()) { 318 322 selector.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name; 323 selector.MaximizationParameter.Hidden = true; 319 324 selector.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName; 325 selector.QualityParameter.Hidden = true; 320 326 } 321 327 } … … 323 329 private void ParameterizeAnalyzers() { 324 330 qualityAnalyzer.ResultsParameter.ActualName = "Results"; 331 qualityAnalyzer.ResultsParameter.Hidden = true; 325 332 if (Problem != null) { 326 333 qualityAnalyzer.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name; 334 qualityAnalyzer.MaximizationParameter.Hidden = true; 327 335 qualityAnalyzer.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName; 328 336 qualityAnalyzer.QualityParameter.Depth = 1; 337 qualityAnalyzer.QualityParameter.Hidden = true; 329 338 qualityAnalyzer.BestKnownQualityParameter.ActualName = Problem.BestKnownQualityParameter.Name; 339 qualityAnalyzer.BestKnownQualityParameter.Hidden = true; 330 340 } 331 341 } … … 334 344 foreach (IIterationBasedOperator op in Problem.Operators.OfType<IIterationBasedOperator>()) { 335 345 op.IterationsParameter.ActualName = "Generations"; 346 op.IterationsParameter.Hidden = true; 336 347 op.MaximumIterationsParameter.ActualName = "MaximumGenerations"; 348 op.MaximumIterationsParameter.Hidden = true; 337 349 } 338 350 } -
trunk/sources/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/IslandGeneticAlgorithm.cs
r5809 r6051 410 410 } 411 411 private void ParameterizeStochasticOperator(IOperator op) { 412 if (op is IStochasticOperator) 413 ((IStochasticOperator)op).RandomParameter.ActualName = RandomCreator.RandomParameter.ActualName; 412 IStochasticOperator stochasticOp = op as IStochasticOperator; 413 if (stochasticOp != null) { 414 stochasticOp.RandomParameter.ActualName = RandomCreator.RandomParameter.ActualName; 415 stochasticOp.RandomParameter.Hidden = true; 416 } 414 417 } 415 418 private void ParameterizeSelectors() { … … 417 420 selector.CopySelected = new BoolValue(true); 418 421 selector.NumberOfSelectedSubScopesParameter.Value = new IntValue(2 * (PopulationSize.Value - Elites.Value)); 422 selector.NumberOfSelectedSubScopesParameter.Hidden = true; 419 423 ParameterizeStochasticOperator(selector); 420 424 } … … 422 426 selector.CopySelected = new BoolValue(true); 423 427 selector.NumberOfSelectedSubScopesParameter.Value = new IntValue((int)Math.Ceiling(PopulationSize.Value * MigrationRate.Value)); 428 selector.NumberOfSelectedSubScopesParameter.Hidden = true; 424 429 ParameterizeStochasticOperator(selector); 425 430 } … … 430 435 foreach (ISingleObjectiveSelector selector in SelectorParameter.ValidValues.OfType<ISingleObjectiveSelector>()) { 431 436 selector.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name; 437 selector.MaximizationParameter.Hidden = true; 432 438 selector.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName; 439 selector.QualityParameter.Hidden = true; 433 440 } 434 441 foreach (ISingleObjectiveSelector selector in EmigrantsSelectorParameter.ValidValues.OfType<ISingleObjectiveSelector>()) { 435 442 selector.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name; 443 selector.MaximizationParameter.Hidden = true; 436 444 selector.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName; 445 selector.QualityParameter.Hidden = true; 437 446 } 438 447 foreach (ISingleObjectiveReplacer selector in ImmigrationReplacerParameter.ValidValues.OfType<ISingleObjectiveReplacer>()) { 439 448 selector.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name; 449 selector.MaximizationParameter.Hidden = true; 440 450 selector.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName; 451 selector.QualityParameter.Hidden = true; 441 452 } 442 453 } … … 444 455 private void ParameterizeAnalyzers() { 445 456 islandQualityAnalyzer.ResultsParameter.ActualName = "Results"; 457 islandQualityAnalyzer.ResultsParameter.Hidden = true; 446 458 islandQualityAnalyzer.QualityParameter.Depth = 1; 447 459 qualityAnalyzer.ResultsParameter.ActualName = "Results"; 460 qualityAnalyzer.ResultsParameter.Hidden = true; 448 461 qualityAnalyzer.QualityParameter.Depth = 2; 449 462 450 463 if (Problem != null) { 451 464 islandQualityAnalyzer.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name; 465 islandQualityAnalyzer.MaximizationParameter.Hidden = true; 452 466 islandQualityAnalyzer.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName; 467 islandQualityAnalyzer.QualityParameter.Hidden = true; 453 468 islandQualityAnalyzer.BestKnownQualityParameter.ActualName = Problem.BestKnownQualityParameter.Name; 469 islandQualityAnalyzer.BestKnownQualityParameter.Hidden = true; 454 470 qualityAnalyzer.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name; 471 qualityAnalyzer.MaximizationParameter.Hidden = true; 455 472 qualityAnalyzer.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName; 473 qualityAnalyzer.QualityParameter.Hidden = true; 456 474 qualityAnalyzer.BestKnownQualityParameter.ActualName = Problem.BestKnownQualityParameter.Name; 475 qualityAnalyzer.BestKnownQualityParameter.Hidden = true; 457 476 } 458 477 } … … 461 480 foreach (IIterationBasedOperator op in Problem.Operators.OfType<IIterationBasedOperator>()) { 462 481 op.IterationsParameter.ActualName = "Generations"; 482 op.IterationsParameter.Hidden = true; 463 483 op.MaximumIterationsParameter.ActualName = "MaximumGenerations"; 484 op.MaximumIterationsParameter.Hidden = true; 464 485 } 465 486 } -
trunk/sources/HeuristicLab.Algorithms.TabuSearch/3.3/TabuSelector.cs
r5445 r6051 69 69 get { return (ILookupParameter<ItemArray<BoolValue>>)Parameters["MoveTabu"]; } 70 70 } 71 p ublicIValueLookupParameter<BoolValue> CopySelectedParameter {71 protected IValueLookupParameter<BoolValue> CopySelectedParameter { 72 72 get { return (IValueLookupParameter<BoolValue>)Parameters["CopySelected"]; } 73 73 } … … 103 103 Parameters.Add(new ValueLookupParameter<BoolValue>("CopySelected", "True if the selected move should be copied.", new BoolValue(false))); 104 104 Parameters.Add(new LookupParameter<BoolValue>("EmptyNeighborhood", "Will be set to true if the neighborhood didn't contain any non-tabu moves, otherwise it is set to false.")); 105 CopySelectedParameter.Hidden = true; 105 106 } 106 107 -
trunk/sources/HeuristicLab.Analysis/3.3/AlleleFrequencyAnalysis/AlleleFrequencyAnalyzer.cs
r5445 r6051 75 75 Parameters.Add(new ValueParameter<IntValue>("UpdateInterval", "The interval in which the allele frequency analysis should be applied.", new IntValue(1))); 76 76 Parameters.Add(new LookupParameter<IntValue>("UpdateCounter", "The value which counts how many times the operator was called since the last update.", "AlleleFrequencyAnalyzerUpdateCounter")); 77 78 MaximizationParameter.Hidden = true; 79 SolutionParameter.Hidden = true; 80 QualityParameter.Hidden = true; 81 BestKnownSolutionParameter.Hidden = true; 82 ResultsParameter.Hidden = true; 83 UpdateCounterParameter.Hidden = true; 77 84 } 78 85 -
trunk/sources/HeuristicLab.Analysis/3.3/PopulationDiversityAnalysis/PopulationDiversityAnalyzer.cs
r5445 r6051 71 71 Parameters.Add(new ValueParameter<IntValue>("UpdateInterval", "The interval in which the population diversity analysis should be applied.", new IntValue(1))); 72 72 Parameters.Add(new LookupParameter<IntValue>("UpdateCounter", "The value which counts how many times the operator was called since the last update.", "PopulationDiversityAnalyzerUpdateCounter")); 73 74 MaximizationParameter.Hidden = true; 75 SolutionParameter.Hidden = true; 76 QualityParameter.Hidden = true; 77 ResultsParameter.Hidden = true; 78 UpdateCounterParameter.Hidden = true; 73 79 } 74 80 -
trunk/sources/HeuristicLab.Analysis/3.3/QualityAnalysis/BestAverageWorstQualityAnalyzer.cs
r6042 r6051 107 107 Parameters.Add(new ValueLookupParameter<PercentValue>("RelativeDifferenceBestKnownToBest", "The relative difference of the best known quality value to the best quality value.")); 108 108 Parameters.Add(new ValueLookupParameter<ResultCollection>("Results", "The results collection where the analysis values should be stored.")); 109 110 BestQualityParameter.Hidden = true; 111 CurrentBestQualityParameter.Hidden = true; 112 CurrentAverageQualityParameter.Hidden = true; 113 CurrentWorstQualityParameter.Hidden = true; 114 QualitiesParameter.Hidden = true; 115 AbsoluteDifferenceBestKnownToBestParameter.Hidden = true; 116 RelativeDifferenceBestKnownToBestParameter.Hidden = true; 109 117 #endregion 110 118 -
trunk/sources/HeuristicLab.Analysis/3.3/QualityAnalysis/BestAverageWorstQualityCalculator.cs
r5445 r6051 65 65 Parameters.Add(new ValueLookupParameter<DoubleValue>("AverageQuality", "The average quality of all solutions.")); 66 66 Parameters.Add(new ValueLookupParameter<DoubleValue>("WorstQuality", "The quality value of the worst solution.")); 67 68 BestQualityParameter.Hidden = true; 69 AverageQualityParameter.Hidden = true; 70 WorstQualityParameter.Hidden = true; 67 71 } 68 72 -
trunk/sources/HeuristicLab.Operators/3.3/MultiOperator.cs
r5445 r6051 87 87 for (int i = 0; i < Operators.Count; i++) { 88 88 IValueParameter<T> opParam = new OptionalValueParameter<T>(i.ToString(), string.Empty, Operators[i]); 89 opParam.Hidden = true; 89 90 opParam.ValueChanged += new EventHandler(opParam_ValueChanged); 90 91 Parameters.Add(opParam); -
trunk/sources/HeuristicLab.Parameters.Views/3.3/LookupParameterView.Designer.cs
r5832 r6051 52 52 // dataTypeLabel 53 53 // 54 this.dataTypeLabel.Location = new System.Drawing.Point(3, 55); 54 55 this.dataTypeLabel.TabIndex = 5; 55 56 // … … 98 99 this.Name = "LookupParameterView"; 99 100 this.Size = new System.Drawing.Size(386, 76); 101 this.Controls.SetChildIndex(this.dataTypeLabel, 0); 100 102 this.Controls.SetChildIndex(this.dataTypeTextBox, 0); 101 this.Controls.SetChildIndex(this.dataTypeLabel, 0);102 103 this.Controls.SetChildIndex(this.infoLabel, 0); 103 104 this.Controls.SetChildIndex(this.actualNameLabel, 0); -
trunk/sources/HeuristicLab.Parameters.Views/3.3/ScopeTreeLookupParameterView.Designer.cs
r5832 r6051 54 54 // dataTypeLabel 55 55 // 56 this.dataTypeLabel.Location = new System.Drawing.Point(3, 55); 56 57 this.dataTypeLabel.TabIndex = 5; 57 58 // … … 120 121 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; 121 122 this.Controls.Add(this.actualNameTextBox); 122 this.Controls.Add(this.actualNameLabel);123 123 this.Controls.Add(this.depthLabel); 124 124 this.Controls.Add(this.depthTextBox); 125 this.Controls.Add(this.actualNameLabel); 125 126 this.Name = "ScopeTreeLookupParameterView"; 126 127 this.Size = new System.Drawing.Size(386, 103); 127 128 this.Controls.SetChildIndex(this.dataTypeTextBox, 0); 129 this.Controls.SetChildIndex(this.actualNameLabel, 0); 128 130 this.Controls.SetChildIndex(this.depthTextBox, 0); 131 this.Controls.SetChildIndex(this.dataTypeLabel, 0); 129 132 this.Controls.SetChildIndex(this.infoLabel, 0); 130 133 this.Controls.SetChildIndex(this.depthLabel, 0); 131 this.Controls.SetChildIndex(this.dataTypeLabel, 0);132 this.Controls.SetChildIndex(this.actualNameLabel, 0);133 134 this.Controls.SetChildIndex(this.actualNameTextBox, 0); 134 135 this.Controls.SetChildIndex(this.nameTextBox, 0); -
trunk/sources/HeuristicLab.Parameters.Views/3.3/ValueLookupParameterView.Designer.cs
r5832 r6051 47 47 // dataTypeLabel 48 48 // 49 this.dataTypeLabel.Location = new System.Drawing.Point(3, 55); 49 50 this.dataTypeLabel.TabIndex = 5; 50 51 // -
trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Analyzers/BestSingleObjectiveTestFunctionSolutionAnalyzer.cs
r5445 r6051 85 85 Parameters.Add(new ValueLookupParameter<ISingleObjectiveTestFunctionProblemEvaluator>("Evaluator", "The evaluator with which the solution is evaluated.")); 86 86 Parameters.Add(new LookupParameter<DoubleMatrix>("Bounds", "The bounds of the function.")); 87 88 MaximizationParameter.Hidden = true; 89 RealVectorParameter.Hidden = true; 90 QualityParameter.Hidden = true; 91 BestSolutionParameter.Hidden = true; 92 BestKnownSolutionParameter.Hidden = true; 93 BestKnownQualityParameter.Hidden = true; 94 ResultsParameter.Hidden = true; 95 EvaluatorParameter.Hidden = true; 96 BoundsParameter.Hidden = true; 87 97 } 88 98 -
trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionProblem.cs
r6042 r6051 379 379 private void ParameterizeSolutionCreator() { 380 380 SolutionCreator.LengthParameter.Value = new IntValue(ProblemSize.Value); 381 SolutionCreator.LengthParameter.Hidden = true; 382 SolutionCreator.BoundsParameter.ActualName = BoundsParameter.Name; 383 SolutionCreator.BoundsParameter.Hidden = true; 381 384 } 382 385 private void ParameterizeEvaluator() { 383 386 Evaluator.PointParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName; 387 Evaluator.PointParameter.Hidden = true; 384 388 BestKnownSolutionParameter.Value = Evaluator.GetBestKnownSolution(ProblemSize.Value); 385 389 } … … 387 391 foreach (IRealVectorCrossover op in Operators.OfType<IRealVectorCrossover>()) { 388 392 op.ParentsParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName; 393 op.ParentsParameter.Hidden = true; 389 394 op.ChildParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName; 395 op.ChildParameter.Hidden = true; 390 396 op.BoundsParameter.ActualName = BoundsParameter.Name; 397 op.BoundsParameter.Hidden = true; 391 398 } 392 399 foreach (IRealVectorManipulator op in Operators.OfType<IRealVectorManipulator>()) { 393 400 op.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName; 401 op.RealVectorParameter.Hidden = true; 394 402 op.BoundsParameter.ActualName = BoundsParameter.Name; 403 op.BoundsParameter.Hidden = true; 395 404 } 396 405 foreach (IRealVectorMoveOperator op in Operators.OfType<IRealVectorMoveOperator>()) { 397 406 op.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName; 407 op.RealVectorParameter.Hidden = true; 398 408 } 399 409 foreach (IRealVectorMoveGenerator op in Operators.OfType<IRealVectorMoveGenerator>()) { 400 410 op.BoundsParameter.ActualName = BoundsParameter.Name; 411 op.BoundsParameter.Hidden = true; 401 412 } 402 413 foreach (ISingleObjectiveTestFunctionAdditiveMoveEvaluator op in Operators.OfType<ISingleObjectiveTestFunctionAdditiveMoveEvaluator>()) { 403 414 op.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName; 404 op.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName; 415 op.QualityParameter.Hidden = true; 416 op.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName; 417 op.RealVectorParameter.Hidden = true; 405 418 } 406 419 foreach (IRealVectorParticleCreator op in Operators.OfType<IRealVectorParticleCreator>()) { 407 420 op.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName; 421 op.RealVectorParameter.Hidden = true; 408 422 op.BoundsParameter.ActualName = BoundsParameter.Name; 423 op.BoundsParameter.Hidden = true; 409 424 op.ProblemSizeParameter.ActualName = ProblemSizeParameter.Name; 425 op.ProblemSizeParameter.Hidden = true; 410 426 } 411 427 foreach (IRealVectorParticleUpdater op in Operators.OfType<IRealVectorParticleUpdater>()) { 412 428 op.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName; 429 op.RealVectorParameter.Hidden = true; 413 430 op.BoundsParameter.ActualName = BoundsParameter.Name; 431 op.BoundsParameter.Hidden = true; 414 432 } 415 433 foreach (IRealVectorSwarmUpdater op in Operators.OfType<IRealVectorSwarmUpdater>()) { 416 434 op.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName; 435 op.RealVectorParameter.Hidden = true; 417 436 op.MaximizationParameter.ActualName = MaximizationParameter.Name; 418 } 419 foreach (var op in Operators.OfType<IRealVectorMultiNeighborhoodShakingOperator>()) 420 op.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName; 437 op.MaximizationParameter.Hidden = true; 438 } 439 foreach (var op in Operators.OfType<IRealVectorMultiNeighborhoodShakingOperator>()) { 440 op.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName; 441 op.RealVectorParameter.Hidden = true; 442 } 421 443 } 422 444 private void UpdateStrategyVectorBounds() { -
trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/Analyzers/BestTSPSolutionAnalyzer.cs
r5445 r6051 78 78 Parameters.Add(new LookupParameter<DoubleValue>("BestKnownQuality", "The quality of the best known solution of this TSP instance.")); 79 79 Parameters.Add(new LookupParameter<Permutation>("BestKnownSolution", "The best known solution of this TSP instance.")); 80 81 MaximizationParameter.Hidden = true; 82 CoordinatesParameter.Hidden = true; 83 PermutationParameter.Hidden = true; 84 QualityParameter.Hidden = true; 85 BestSolutionParameter.Hidden = true; 86 ResultsParameter.Hidden = true; 87 BestKnownQualityParameter.Hidden = true; 88 BestKnownSolutionParameter.Hidden = true; 80 89 } 81 90 -
trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs
r6042 r6051 163 163 Parameters.Add(new OptionalValueParameter<Permutation>("BestKnownSolution", "The best known solution of this TSP instance.")); 164 164 165 MaximizationParameter.Hidden = true; 165 166 DistanceMatrixParameter.ReactOnValueToStringChangedAndValueItemImageChanged = false; 166 167 … … 325 326 private void ParameterizeSolutionCreator() { 326 327 SolutionCreator.LengthParameter.Value = new IntValue(Coordinates.Rows); 328 SolutionCreator.LengthParameter.Hidden = true; 327 329 SolutionCreator.PermutationTypeParameter.Value = new PermutationType(PermutationTypes.RelativeUndirected); 330 SolutionCreator.PermutationTypeParameter.Hidden = true; 328 331 } 329 332 private void ParameterizeEvaluator() { 330 if (Evaluator is ITSPPathEvaluator) 331 ((ITSPPathEvaluator)Evaluator).PermutationParameter.ActualName = SolutionCreator.PermutationParameter.ActualName; 333 if (Evaluator is ITSPPathEvaluator) { 334 ITSPPathEvaluator evaluator = (ITSPPathEvaluator)Evaluator; 335 evaluator.PermutationParameter.ActualName = SolutionCreator.PermutationParameter.ActualName; 336 evaluator.PermutationParameter.Hidden = true; 337 } 332 338 if (Evaluator is ITSPCoordinatesPathEvaluator) { 333 339 ITSPCoordinatesPathEvaluator evaluator = (ITSPCoordinatesPathEvaluator)Evaluator; 334 340 evaluator.CoordinatesParameter.ActualName = CoordinatesParameter.Name; 341 evaluator.CoordinatesParameter.Hidden = true; 335 342 evaluator.DistanceMatrixParameter.ActualName = DistanceMatrixParameter.Name; 343 evaluator.DistanceMatrixParameter.Hidden = true; 336 344 evaluator.UseDistanceMatrixParameter.ActualName = UseDistanceMatrixParameter.Name; 345 evaluator.UseDistanceMatrixParameter.Hidden = true; 337 346 } 338 347 } … … 368 377 foreach (IPermutationCrossover op in Operators.OfType<IPermutationCrossover>()) { 369 378 op.ParentsParameter.ActualName = SolutionCreator.PermutationParameter.ActualName; 379 op.ParentsParameter.Hidden = true; 370 380 op.ChildParameter.ActualName = SolutionCreator.PermutationParameter.ActualName; 381 op.ChildParameter.Hidden = true; 371 382 } 372 383 foreach (IPermutationManipulator op in Operators.OfType<IPermutationManipulator>()) { 373 384 op.PermutationParameter.ActualName = SolutionCreator.PermutationParameter.ActualName; 385 op.PermutationParameter.Hidden = true; 374 386 } 375 387 foreach (IPermutationMoveOperator op in Operators.OfType<IPermutationMoveOperator>()) { 376 388 op.PermutationParameter.ActualName = SolutionCreator.PermutationParameter.ActualName; 389 op.PermutationParameter.Hidden = true; 377 390 } 378 391 foreach (ITSPPathMoveEvaluator op in Operators.OfType<ITSPPathMoveEvaluator>()) { 379 392 op.CoordinatesParameter.ActualName = CoordinatesParameter.Name; 393 op.CoordinatesParameter.Hidden = true; 380 394 op.DistanceMatrixParameter.ActualName = DistanceMatrixParameter.Name; 395 op.DistanceMatrixParameter.Hidden = true; 381 396 op.UseDistanceMatrixParameter.ActualName = UseDistanceMatrixParameter.Name; 397 op.UseDistanceMatrixParameter.Hidden = true; 382 398 op.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName; 399 op.QualityParameter.Hidden = true; 383 400 op.PermutationParameter.ActualName = SolutionCreator.PermutationParameter.ActualName; 401 op.PermutationParameter.Hidden = true; 384 402 } 385 403 string inversionMove = Operators.OfType<IMoveGenerator>().OfType<IPermutationInversionMoveOperator>().First().InversionMoveParameter.ActualName; 386 foreach (IPermutationInversionMoveOperator op in Operators.OfType<IPermutationInversionMoveOperator>()) 404 foreach (IPermutationInversionMoveOperator op in Operators.OfType<IPermutationInversionMoveOperator>()) { 387 405 op.InversionMoveParameter.ActualName = inversionMove; 406 op.InversionMoveParameter.Hidden = true; 407 } 388 408 string translocationMove = Operators.OfType<IMoveGenerator>().OfType<IPermutationTranslocationMoveOperator>().First().TranslocationMoveParameter.ActualName; 389 foreach (IPermutationTranslocationMoveOperator op in Operators.OfType<IPermutationTranslocationMoveOperator>()) 409 foreach (IPermutationTranslocationMoveOperator op in Operators.OfType<IPermutationTranslocationMoveOperator>()) { 390 410 op.TranslocationMoveParameter.ActualName = translocationMove; 391 foreach (IPermutationMultiNeighborhoodShakingOperator op in Operators.OfType<IPermutationMultiNeighborhoodShakingOperator>()) 411 op.TranslocationMoveParameter.Hidden = true; 412 } 413 foreach (IPermutationMultiNeighborhoodShakingOperator op in Operators.OfType<IPermutationMultiNeighborhoodShakingOperator>()) { 392 414 op.PermutationParameter.ActualName = SolutionCreator.PermutationParameter.ActualName; 415 op.PermutationParameter.Hidden = true; 416 } 393 417 } 394 418 -
trunk/sources/HeuristicLab.Selection/3.3/ConditionalSelector.cs
r5445 r6051 34 34 get { return (ScopeTreeLookupParameter<BoolValue>)Parameters["Condition"]; } 35 35 } 36 p ublicValueParameter<BoolValue> CopySelectedParameter {37 get { return ( ValueParameter<BoolValue>)Parameters["CopySelected"]; }36 protected IValueParameter<BoolValue> CopySelectedParameter { 37 get { return (IValueParameter<BoolValue>)Parameters["CopySelected"]; } 38 38 } 39 39 … … 55 55 Parameters.Add(new ScopeTreeLookupParameter<BoolValue>("Condition", "The boolean variable based on which the scopes are selected into a true scope-branch and a false scope-branch.")); 56 56 Parameters.Add(new ValueParameter<BoolValue>("CopySelected", "The parameter that decides whether the selected scopes should be copied or moved.", new BoolValue(true))); 57 CopySelectedParameter.Hidden = true; 57 58 } 58 59 -
trunk/sources/HeuristicLab.Selection/3.3/CrowdedTournamentSelector.cs
r5445 r6051 39 39 get { return (IValueLookupParameter<IntValue>)Parameters["NumberOfSelectedSubScopes"]; } 40 40 } 41 p ublicIValueParameter<BoolValue> CopySelectedParameter {41 protected IValueParameter<BoolValue> CopySelectedParameter { 42 42 get { return (IValueParameter<BoolValue>)Parameters["CopySelected"]; } 43 43 } … … 76 76 Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("CrowdingDistance", "The solutions' crowding distance values.")); 77 77 Parameters.Add(new ValueLookupParameter<IntValue>("GroupSize", "The size of the group from which the best will be chosen.", new IntValue(2))); 78 CopySelectedParameter.Hidden = true; 78 79 } 79 80 -
trunk/sources/HeuristicLab.Selection/3.3/GenderSpecificSelector.cs
r5445 r6051 43 43 get { return (IValueLookupParameter<IntValue>)Parameters["NumberOfSelectedSubScopes"]; } 44 44 } 45 p ublicIValueLookupParameter<BoolValue> CopySelectedParameter {45 protected IValueLookupParameter<BoolValue> CopySelectedParameter { 46 46 get { return (IValueLookupParameter<BoolValue>)Parameters["CopySelected"]; } 47 47 } … … 97 97 Parameters.Add(new ValueParameter<ISelector>("FemaleSelector", "The selection operator to select the first parent.")); 98 98 Parameters.Add(new ValueParameter<ISelector>("MaleSelector", "The selection operator to select the second parent.")); 99 CopySelectedParameter.Hidden = true; 99 100 #endregion 100 101 -
trunk/sources/HeuristicLab.Selection/3.3/LeftSelector.cs
r5445 r6051 34 34 [StorableClass] 35 35 public sealed class LeftSelector : Selector { 36 private ValueParameter<BoolValue> CopySelectedParameter {37 get { return ( ValueParameter<BoolValue>)Parameters["CopySelected"]; }36 private IValueParameter<BoolValue> CopySelectedParameter { 37 get { return (IValueParameter<BoolValue>)Parameters["CopySelected"]; } 38 38 } 39 39 public IValueLookupParameter<IntValue> NumberOfSelectedSubScopesParameter { … … 59 59 Parameters.Add(new ValueParameter<BoolValue>("CopySelected", "True if the selected sub-scopes should be copied, otherwise false.", new BoolValue(true))); 60 60 Parameters.Add(new ValueLookupParameter<IntValue>("NumberOfSelectedSubScopes", "The number of sub-scopes which should be selected.")); 61 CopySelectedParameter.Hidden = true; 61 62 } 62 63 -
trunk/sources/HeuristicLab.Selection/3.3/NoSameMatesSelector.cs
r6035 r6051 74 74 #endregion 75 75 76 CopySelectedParameter.Hidden = true;77 76 RegisterParameterEventHandlers(); 78 77 } -
trunk/sources/HeuristicLab.Selection/3.3/RandomSelector.cs
r5445 r6051 35 35 [StorableClass] 36 36 public sealed class RandomSelector : StochasticSelector, ISelector { 37 private ValueParameter<BoolValue> CopySelectedParameter {38 get { return ( ValueParameter<BoolValue>)Parameters["CopySelected"]; }37 private IValueParameter<BoolValue> CopySelectedParameter { 38 get { return (IValueParameter<BoolValue>)Parameters["CopySelected"]; } 39 39 } 40 40 public IValueLookupParameter<IntValue> NumberOfSelectedSubScopesParameter { … … 59 59 Parameters.Add(new ValueParameter<BoolValue>("CopySelected", "True if the selected sub-scopes should be copied, otherwise false.", new BoolValue(true))); 60 60 Parameters.Add(new ValueLookupParameter<IntValue>("NumberOfSelectedSubScopes", "The number of sub-scopes which should be selected.")); 61 CopySelectedParameter.Hidden = true; 61 62 } 62 63 -
trunk/sources/HeuristicLab.Selection/3.3/RightSelector.cs
r5445 r6051 34 34 [StorableClass] 35 35 public sealed class RightSelector : Selector { 36 private ValueParameter<BoolValue> CopySelectedParameter {37 get { return ( ValueParameter<BoolValue>)Parameters["CopySelected"]; }36 private IValueParameter<BoolValue> CopySelectedParameter { 37 get { return (IValueParameter<BoolValue>)Parameters["CopySelected"]; } 38 38 } 39 39 public IValueLookupParameter<IntValue> NumberOfSelectedSubScopesParameter { … … 56 56 Parameters.Add(new ValueParameter<BoolValue>("CopySelected", "True if the selected sub-scopes should be copied, otherwise false.", new BoolValue(true))); 57 57 Parameters.Add(new ValueLookupParameter<IntValue>("NumberOfSelectedSubScopes", "The number of sub-scopes which should be selected.")); 58 CopySelectedParameter.Hidden = true; 58 59 } 59 60 -
trunk/sources/HeuristicLab.Selection/3.3/SingleObjectiveSelector.cs
r5445 r6051 33 33 [StorableClass] 34 34 public abstract class SingleObjectiveSelector : Selector { 35 protected ValueParameter<BoolValue> CopySelectedParameter {36 get { return ( ValueParameter<BoolValue>)Parameters["CopySelected"]; }35 protected IValueParameter<BoolValue> CopySelectedParameter { 36 get { return (IValueParameter<BoolValue>)Parameters["CopySelected"]; } 37 37 } 38 38 public IValueLookupParameter<IntValue> NumberOfSelectedSubScopesParameter { 39 get { return ( ValueLookupParameter<IntValue>)Parameters["NumberOfSelectedSubScopes"]; }39 get { return (IValueLookupParameter<IntValue>)Parameters["NumberOfSelectedSubScopes"]; } 40 40 } 41 41 public IValueLookupParameter<BoolValue> MaximizationParameter { … … 61 61 Parameters.Add(new ValueLookupParameter<BoolValue>("Maximization", "True if the current problem is a maximization problem, otherwise false.")); 62 62 Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("Quality", "The quality value contained in each sub-scope which is used for selection.")); 63 CopySelectedParameter.Hidden = true; 63 64 } 64 65 }
Note: See TracChangeset
for help on using the changeset viewer.