Free cookie consent management tool by TermsFeed Policy Generator

Changeset 6051


Ignore:
Timestamp:
04/26/11 04:10:17 (13 years ago)
Author:
swagner
Message:

Changed some more parameters to be hidden per default and corrected wrong layout in some parameter views (#1377)

Location:
trunk/sources
Files:
23 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/GeneticAlgorithm.cs

    r5809 r6051  
    305305    }
    306306    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      }
    309312    }
    310313    private void ParameterizeSelectors() {
     
    312315        selector.CopySelected = new BoolValue(true);
    313316        selector.NumberOfSelectedSubScopesParameter.Value = new IntValue(2 * (PopulationSizeParameter.Value.Value - ElitesParameter.Value.Value));
     317        selector.NumberOfSelectedSubScopesParameter.Hidden = true;
    314318        ParameterizeStochasticOperator(selector);
    315319      }
     
    317321        foreach (ISingleObjectiveSelector selector in SelectorParameter.ValidValues.OfType<ISingleObjectiveSelector>()) {
    318322          selector.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name;
     323          selector.MaximizationParameter.Hidden = true;
    319324          selector.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName;
     325          selector.QualityParameter.Hidden = true;
    320326        }
    321327      }
     
    323329    private void ParameterizeAnalyzers() {
    324330      qualityAnalyzer.ResultsParameter.ActualName = "Results";
     331      qualityAnalyzer.ResultsParameter.Hidden = true;
    325332      if (Problem != null) {
    326333        qualityAnalyzer.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name;
     334        qualityAnalyzer.MaximizationParameter.Hidden = true;
    327335        qualityAnalyzer.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName;
    328336        qualityAnalyzer.QualityParameter.Depth = 1;
     337        qualityAnalyzer.QualityParameter.Hidden = true;
    329338        qualityAnalyzer.BestKnownQualityParameter.ActualName = Problem.BestKnownQualityParameter.Name;
     339        qualityAnalyzer.BestKnownQualityParameter.Hidden = true;
    330340      }
    331341    }
     
    334344        foreach (IIterationBasedOperator op in Problem.Operators.OfType<IIterationBasedOperator>()) {
    335345          op.IterationsParameter.ActualName = "Generations";
     346          op.IterationsParameter.Hidden = true;
    336347          op.MaximumIterationsParameter.ActualName = "MaximumGenerations";
     348          op.MaximumIterationsParameter.Hidden = true;
    337349        }
    338350      }
  • trunk/sources/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/IslandGeneticAlgorithm.cs

    r5809 r6051  
    410410    }
    411411    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      }
    414417    }
    415418    private void ParameterizeSelectors() {
     
    417420        selector.CopySelected = new BoolValue(true);
    418421        selector.NumberOfSelectedSubScopesParameter.Value = new IntValue(2 * (PopulationSize.Value - Elites.Value));
     422        selector.NumberOfSelectedSubScopesParameter.Hidden = true;
    419423        ParameterizeStochasticOperator(selector);
    420424      }
     
    422426        selector.CopySelected = new BoolValue(true);
    423427        selector.NumberOfSelectedSubScopesParameter.Value = new IntValue((int)Math.Ceiling(PopulationSize.Value * MigrationRate.Value));
     428        selector.NumberOfSelectedSubScopesParameter.Hidden = true;
    424429        ParameterizeStochasticOperator(selector);
    425430      }
     
    430435        foreach (ISingleObjectiveSelector selector in SelectorParameter.ValidValues.OfType<ISingleObjectiveSelector>()) {
    431436          selector.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name;
     437          selector.MaximizationParameter.Hidden = true;
    432438          selector.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName;
     439          selector.QualityParameter.Hidden = true;
    433440        }
    434441        foreach (ISingleObjectiveSelector selector in EmigrantsSelectorParameter.ValidValues.OfType<ISingleObjectiveSelector>()) {
    435442          selector.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name;
     443          selector.MaximizationParameter.Hidden = true;
    436444          selector.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName;
     445          selector.QualityParameter.Hidden = true;
    437446        }
    438447        foreach (ISingleObjectiveReplacer selector in ImmigrationReplacerParameter.ValidValues.OfType<ISingleObjectiveReplacer>()) {
    439448          selector.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name;
     449          selector.MaximizationParameter.Hidden = true;
    440450          selector.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName;
     451          selector.QualityParameter.Hidden = true;
    441452        }
    442453      }
     
    444455    private void ParameterizeAnalyzers() {
    445456      islandQualityAnalyzer.ResultsParameter.ActualName = "Results";
     457      islandQualityAnalyzer.ResultsParameter.Hidden = true;
    446458      islandQualityAnalyzer.QualityParameter.Depth = 1;
    447459      qualityAnalyzer.ResultsParameter.ActualName = "Results";
     460      qualityAnalyzer.ResultsParameter.Hidden = true;
    448461      qualityAnalyzer.QualityParameter.Depth = 2;
    449462
    450463      if (Problem != null) {
    451464        islandQualityAnalyzer.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name;
     465        islandQualityAnalyzer.MaximizationParameter.Hidden = true;
    452466        islandQualityAnalyzer.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName;
     467        islandQualityAnalyzer.QualityParameter.Hidden = true;
    453468        islandQualityAnalyzer.BestKnownQualityParameter.ActualName = Problem.BestKnownQualityParameter.Name;
     469        islandQualityAnalyzer.BestKnownQualityParameter.Hidden = true;
    454470        qualityAnalyzer.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name;
     471        qualityAnalyzer.MaximizationParameter.Hidden = true;
    455472        qualityAnalyzer.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName;
     473        qualityAnalyzer.QualityParameter.Hidden = true;
    456474        qualityAnalyzer.BestKnownQualityParameter.ActualName = Problem.BestKnownQualityParameter.Name;
     475        qualityAnalyzer.BestKnownQualityParameter.Hidden = true;
    457476      }
    458477    }
     
    461480        foreach (IIterationBasedOperator op in Problem.Operators.OfType<IIterationBasedOperator>()) {
    462481          op.IterationsParameter.ActualName = "Generations";
     482          op.IterationsParameter.Hidden = true;
    463483          op.MaximumIterationsParameter.ActualName = "MaximumGenerations";
     484          op.MaximumIterationsParameter.Hidden = true;
    464485        }
    465486      }
  • trunk/sources/HeuristicLab.Algorithms.TabuSearch/3.3/TabuSelector.cs

    r5445 r6051  
    6969      get { return (ILookupParameter<ItemArray<BoolValue>>)Parameters["MoveTabu"]; }
    7070    }
    71     public IValueLookupParameter<BoolValue> CopySelectedParameter {
     71    protected IValueLookupParameter<BoolValue> CopySelectedParameter {
    7272      get { return (IValueLookupParameter<BoolValue>)Parameters["CopySelected"]; }
    7373    }
     
    103103      Parameters.Add(new ValueLookupParameter<BoolValue>("CopySelected", "True if the selected move should be copied.", new BoolValue(false)));
    104104      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;
    105106    }
    106107
  • trunk/sources/HeuristicLab.Analysis/3.3/AlleleFrequencyAnalysis/AlleleFrequencyAnalyzer.cs

    r5445 r6051  
    7575      Parameters.Add(new ValueParameter<IntValue>("UpdateInterval", "The interval in which the allele frequency analysis should be applied.", new IntValue(1)));
    7676      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;
    7784    }
    7885
  • trunk/sources/HeuristicLab.Analysis/3.3/PopulationDiversityAnalysis/PopulationDiversityAnalyzer.cs

    r5445 r6051  
    7171      Parameters.Add(new ValueParameter<IntValue>("UpdateInterval", "The interval in which the population diversity analysis should be applied.", new IntValue(1)));
    7272      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;
    7379    }
    7480
  • trunk/sources/HeuristicLab.Analysis/3.3/QualityAnalysis/BestAverageWorstQualityAnalyzer.cs

    r6042 r6051  
    107107      Parameters.Add(new ValueLookupParameter<PercentValue>("RelativeDifferenceBestKnownToBest", "The relative difference of the best known quality value to the best quality value."));
    108108      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;
    109117      #endregion
    110118
  • trunk/sources/HeuristicLab.Analysis/3.3/QualityAnalysis/BestAverageWorstQualityCalculator.cs

    r5445 r6051  
    6565      Parameters.Add(new ValueLookupParameter<DoubleValue>("AverageQuality", "The average quality of all solutions."));
    6666      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;
    6771    }
    6872
  • trunk/sources/HeuristicLab.Operators/3.3/MultiOperator.cs

    r5445 r6051  
    8787      for (int i = 0; i < Operators.Count; i++) {
    8888        IValueParameter<T> opParam = new OptionalValueParameter<T>(i.ToString(), string.Empty, Operators[i]);
     89        opParam.Hidden = true;
    8990        opParam.ValueChanged += new EventHandler(opParam_ValueChanged);
    9091        Parameters.Add(opParam);
  • trunk/sources/HeuristicLab.Parameters.Views/3.3/LookupParameterView.Designer.cs

    r5832 r6051  
    5252      // dataTypeLabel
    5353      //
     54      this.dataTypeLabel.Location = new System.Drawing.Point(3, 55);
    5455      this.dataTypeLabel.TabIndex = 5;
    5556      //
     
    9899      this.Name = "LookupParameterView";
    99100      this.Size = new System.Drawing.Size(386, 76);
     101      this.Controls.SetChildIndex(this.dataTypeLabel, 0);
    100102      this.Controls.SetChildIndex(this.dataTypeTextBox, 0);
    101       this.Controls.SetChildIndex(this.dataTypeLabel, 0);
    102103      this.Controls.SetChildIndex(this.infoLabel, 0);
    103104      this.Controls.SetChildIndex(this.actualNameLabel, 0);
  • trunk/sources/HeuristicLab.Parameters.Views/3.3/ScopeTreeLookupParameterView.Designer.cs

    r5832 r6051  
    5454      // dataTypeLabel
    5555      //
     56      this.dataTypeLabel.Location = new System.Drawing.Point(3, 55);
    5657      this.dataTypeLabel.TabIndex = 5;
    5758      //
     
    120121      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
    121122      this.Controls.Add(this.actualNameTextBox);
    122       this.Controls.Add(this.actualNameLabel);
    123123      this.Controls.Add(this.depthLabel);
    124124      this.Controls.Add(this.depthTextBox);
     125      this.Controls.Add(this.actualNameLabel);
    125126      this.Name = "ScopeTreeLookupParameterView";
    126127      this.Size = new System.Drawing.Size(386, 103);
    127128      this.Controls.SetChildIndex(this.dataTypeTextBox, 0);
     129      this.Controls.SetChildIndex(this.actualNameLabel, 0);
    128130      this.Controls.SetChildIndex(this.depthTextBox, 0);
     131      this.Controls.SetChildIndex(this.dataTypeLabel, 0);
    129132      this.Controls.SetChildIndex(this.infoLabel, 0);
    130133      this.Controls.SetChildIndex(this.depthLabel, 0);
    131       this.Controls.SetChildIndex(this.dataTypeLabel, 0);
    132       this.Controls.SetChildIndex(this.actualNameLabel, 0);
    133134      this.Controls.SetChildIndex(this.actualNameTextBox, 0);
    134135      this.Controls.SetChildIndex(this.nameTextBox, 0);
  • trunk/sources/HeuristicLab.Parameters.Views/3.3/ValueLookupParameterView.Designer.cs

    r5832 r6051  
    4747      // dataTypeLabel
    4848      //
     49      this.dataTypeLabel.Location = new System.Drawing.Point(3, 55);
    4950      this.dataTypeLabel.TabIndex = 5;
    5051      //
  • trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Analyzers/BestSingleObjectiveTestFunctionSolutionAnalyzer.cs

    r5445 r6051  
    8585      Parameters.Add(new ValueLookupParameter<ISingleObjectiveTestFunctionProblemEvaluator>("Evaluator", "The evaluator with which the solution is evaluated."));
    8686      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;
    8797    }
    8898
  • trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionProblem.cs

    r6042 r6051  
    379379    private void ParameterizeSolutionCreator() {
    380380      SolutionCreator.LengthParameter.Value = new IntValue(ProblemSize.Value);
     381      SolutionCreator.LengthParameter.Hidden = true;
     382      SolutionCreator.BoundsParameter.ActualName = BoundsParameter.Name;
     383      SolutionCreator.BoundsParameter.Hidden = true;
    381384    }
    382385    private void ParameterizeEvaluator() {
    383386      Evaluator.PointParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
     387      Evaluator.PointParameter.Hidden = true;
    384388      BestKnownSolutionParameter.Value = Evaluator.GetBestKnownSolution(ProblemSize.Value);
    385389    }
     
    387391      foreach (IRealVectorCrossover op in Operators.OfType<IRealVectorCrossover>()) {
    388392        op.ParentsParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
     393        op.ParentsParameter.Hidden = true;
    389394        op.ChildParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
     395        op.ChildParameter.Hidden = true;
    390396        op.BoundsParameter.ActualName = BoundsParameter.Name;
     397        op.BoundsParameter.Hidden = true;
    391398      }
    392399      foreach (IRealVectorManipulator op in Operators.OfType<IRealVectorManipulator>()) {
    393400        op.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
     401        op.RealVectorParameter.Hidden = true;
    394402        op.BoundsParameter.ActualName = BoundsParameter.Name;
     403        op.BoundsParameter.Hidden = true;
    395404      }
    396405      foreach (IRealVectorMoveOperator op in Operators.OfType<IRealVectorMoveOperator>()) {
    397406        op.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
     407        op.RealVectorParameter.Hidden = true;
    398408      }
    399409      foreach (IRealVectorMoveGenerator op in Operators.OfType<IRealVectorMoveGenerator>()) {
    400410        op.BoundsParameter.ActualName = BoundsParameter.Name;
     411        op.BoundsParameter.Hidden = true;
    401412      }
    402413      foreach (ISingleObjectiveTestFunctionAdditiveMoveEvaluator op in Operators.OfType<ISingleObjectiveTestFunctionAdditiveMoveEvaluator>()) {
    403414        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;
    405418      }
    406419      foreach (IRealVectorParticleCreator op in Operators.OfType<IRealVectorParticleCreator>()) {
    407420        op.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
     421        op.RealVectorParameter.Hidden = true;
    408422        op.BoundsParameter.ActualName = BoundsParameter.Name;
     423        op.BoundsParameter.Hidden = true;
    409424        op.ProblemSizeParameter.ActualName = ProblemSizeParameter.Name;
     425        op.ProblemSizeParameter.Hidden = true;
    410426      }
    411427      foreach (IRealVectorParticleUpdater op in Operators.OfType<IRealVectorParticleUpdater>()) {
    412428        op.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
     429        op.RealVectorParameter.Hidden = true;
    413430        op.BoundsParameter.ActualName = BoundsParameter.Name;
     431        op.BoundsParameter.Hidden = true;
    414432      }
    415433      foreach (IRealVectorSwarmUpdater op in Operators.OfType<IRealVectorSwarmUpdater>()) {
    416434        op.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
     435        op.RealVectorParameter.Hidden = true;
    417436        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      }
    421443    }
    422444    private void UpdateStrategyVectorBounds() {
  • trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/Analyzers/BestTSPSolutionAnalyzer.cs

    r5445 r6051  
    7878      Parameters.Add(new LookupParameter<DoubleValue>("BestKnownQuality", "The quality of the best known solution of this TSP instance."));
    7979      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;
    8089    }
    8190
  • trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs

    r6042 r6051  
    163163      Parameters.Add(new OptionalValueParameter<Permutation>("BestKnownSolution", "The best known solution of this TSP instance."));
    164164
     165      MaximizationParameter.Hidden = true;
    165166      DistanceMatrixParameter.ReactOnValueToStringChangedAndValueItemImageChanged = false;
    166167
     
    325326    private void ParameterizeSolutionCreator() {
    326327      SolutionCreator.LengthParameter.Value = new IntValue(Coordinates.Rows);
     328      SolutionCreator.LengthParameter.Hidden = true;
    327329      SolutionCreator.PermutationTypeParameter.Value = new PermutationType(PermutationTypes.RelativeUndirected);
     330      SolutionCreator.PermutationTypeParameter.Hidden = true;
    328331    }
    329332    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      }
    332338      if (Evaluator is ITSPCoordinatesPathEvaluator) {
    333339        ITSPCoordinatesPathEvaluator evaluator = (ITSPCoordinatesPathEvaluator)Evaluator;
    334340        evaluator.CoordinatesParameter.ActualName = CoordinatesParameter.Name;
     341        evaluator.CoordinatesParameter.Hidden = true;
    335342        evaluator.DistanceMatrixParameter.ActualName = DistanceMatrixParameter.Name;
     343        evaluator.DistanceMatrixParameter.Hidden = true;
    336344        evaluator.UseDistanceMatrixParameter.ActualName = UseDistanceMatrixParameter.Name;
     345        evaluator.UseDistanceMatrixParameter.Hidden = true;
    337346      }
    338347    }
     
    368377      foreach (IPermutationCrossover op in Operators.OfType<IPermutationCrossover>()) {
    369378        op.ParentsParameter.ActualName = SolutionCreator.PermutationParameter.ActualName;
     379        op.ParentsParameter.Hidden = true;
    370380        op.ChildParameter.ActualName = SolutionCreator.PermutationParameter.ActualName;
     381        op.ChildParameter.Hidden = true;
    371382      }
    372383      foreach (IPermutationManipulator op in Operators.OfType<IPermutationManipulator>()) {
    373384        op.PermutationParameter.ActualName = SolutionCreator.PermutationParameter.ActualName;
     385        op.PermutationParameter.Hidden = true;
    374386      }
    375387      foreach (IPermutationMoveOperator op in Operators.OfType<IPermutationMoveOperator>()) {
    376388        op.PermutationParameter.ActualName = SolutionCreator.PermutationParameter.ActualName;
     389        op.PermutationParameter.Hidden = true;
    377390      }
    378391      foreach (ITSPPathMoveEvaluator op in Operators.OfType<ITSPPathMoveEvaluator>()) {
    379392        op.CoordinatesParameter.ActualName = CoordinatesParameter.Name;
     393        op.CoordinatesParameter.Hidden = true;
    380394        op.DistanceMatrixParameter.ActualName = DistanceMatrixParameter.Name;
     395        op.DistanceMatrixParameter.Hidden = true;
    381396        op.UseDistanceMatrixParameter.ActualName = UseDistanceMatrixParameter.Name;
     397        op.UseDistanceMatrixParameter.Hidden = true;
    382398        op.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
     399        op.QualityParameter.Hidden = true;
    383400        op.PermutationParameter.ActualName = SolutionCreator.PermutationParameter.ActualName;
     401        op.PermutationParameter.Hidden = true;
    384402      }
    385403      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>()) {
    387405        op.InversionMoveParameter.ActualName = inversionMove;
     406        op.InversionMoveParameter.Hidden = true;
     407      }
    388408      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>()) {
    390410        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>()) {
    392414        op.PermutationParameter.ActualName = SolutionCreator.PermutationParameter.ActualName;
     415        op.PermutationParameter.Hidden = true;
     416      }
    393417    }
    394418
  • trunk/sources/HeuristicLab.Selection/3.3/ConditionalSelector.cs

    r5445 r6051  
    3434      get { return (ScopeTreeLookupParameter<BoolValue>)Parameters["Condition"]; }
    3535    }
    36     public ValueParameter<BoolValue> CopySelectedParameter {
    37       get { return (ValueParameter<BoolValue>)Parameters["CopySelected"]; }
     36    protected IValueParameter<BoolValue> CopySelectedParameter {
     37      get { return (IValueParameter<BoolValue>)Parameters["CopySelected"]; }
    3838    }
    3939
     
    5555      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."));
    5656      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;
    5758    }
    5859
  • trunk/sources/HeuristicLab.Selection/3.3/CrowdedTournamentSelector.cs

    r5445 r6051  
    3939      get { return (IValueLookupParameter<IntValue>)Parameters["NumberOfSelectedSubScopes"]; }
    4040    }
    41     public IValueParameter<BoolValue> CopySelectedParameter {
     41    protected IValueParameter<BoolValue> CopySelectedParameter {
    4242      get { return (IValueParameter<BoolValue>)Parameters["CopySelected"]; }
    4343    }
     
    7676      Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("CrowdingDistance", "The solutions' crowding distance values."));
    7777      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;
    7879    }
    7980
  • trunk/sources/HeuristicLab.Selection/3.3/GenderSpecificSelector.cs

    r5445 r6051  
    4343      get { return (IValueLookupParameter<IntValue>)Parameters["NumberOfSelectedSubScopes"]; }
    4444    }
    45     public IValueLookupParameter<BoolValue> CopySelectedParameter {
     45    protected IValueLookupParameter<BoolValue> CopySelectedParameter {
    4646      get { return (IValueLookupParameter<BoolValue>)Parameters["CopySelected"]; }
    4747    }
     
    9797      Parameters.Add(new ValueParameter<ISelector>("FemaleSelector", "The selection operator to select the first parent."));
    9898      Parameters.Add(new ValueParameter<ISelector>("MaleSelector", "The selection operator to select the second parent."));
     99      CopySelectedParameter.Hidden = true;
    99100      #endregion
    100101
  • trunk/sources/HeuristicLab.Selection/3.3/LeftSelector.cs

    r5445 r6051  
    3434  [StorableClass]
    3535  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"]; }
    3838    }
    3939    public IValueLookupParameter<IntValue> NumberOfSelectedSubScopesParameter {
     
    5959      Parameters.Add(new ValueParameter<BoolValue>("CopySelected", "True if the selected sub-scopes should be copied, otherwise false.", new BoolValue(true)));
    6060      Parameters.Add(new ValueLookupParameter<IntValue>("NumberOfSelectedSubScopes", "The number of sub-scopes which should be selected."));
     61      CopySelectedParameter.Hidden = true;
    6162    }
    6263
  • trunk/sources/HeuristicLab.Selection/3.3/NoSameMatesSelector.cs

    r6035 r6051  
    7474      #endregion
    7575
    76       CopySelectedParameter.Hidden = true;
    7776      RegisterParameterEventHandlers();
    7877    }
  • trunk/sources/HeuristicLab.Selection/3.3/RandomSelector.cs

    r5445 r6051  
    3535  [StorableClass]
    3636  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"]; }
    3939    }
    4040    public IValueLookupParameter<IntValue> NumberOfSelectedSubScopesParameter {
     
    5959      Parameters.Add(new ValueParameter<BoolValue>("CopySelected", "True if the selected sub-scopes should be copied, otherwise false.", new BoolValue(true)));
    6060      Parameters.Add(new ValueLookupParameter<IntValue>("NumberOfSelectedSubScopes", "The number of sub-scopes which should be selected."));
     61      CopySelectedParameter.Hidden = true;
    6162    }
    6263
  • trunk/sources/HeuristicLab.Selection/3.3/RightSelector.cs

    r5445 r6051  
    3434  [StorableClass]
    3535  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"]; }
    3838    }
    3939    public IValueLookupParameter<IntValue> NumberOfSelectedSubScopesParameter {
     
    5656      Parameters.Add(new ValueParameter<BoolValue>("CopySelected", "True if the selected sub-scopes should be copied, otherwise false.", new BoolValue(true)));
    5757      Parameters.Add(new ValueLookupParameter<IntValue>("NumberOfSelectedSubScopes", "The number of sub-scopes which should be selected."));
     58      CopySelectedParameter.Hidden = true;
    5859    }
    5960
  • trunk/sources/HeuristicLab.Selection/3.3/SingleObjectiveSelector.cs

    r5445 r6051  
    3333  [StorableClass]
    3434  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"]; }
    3737    }
    3838    public IValueLookupParameter<IntValue> NumberOfSelectedSubScopesParameter {
    39       get { return (ValueLookupParameter<IntValue>)Parameters["NumberOfSelectedSubScopes"]; }
     39      get { return (IValueLookupParameter<IntValue>)Parameters["NumberOfSelectedSubScopes"]; }
    4040    }
    4141    public IValueLookupParameter<BoolValue> MaximizationParameter {
     
    6161      Parameters.Add(new ValueLookupParameter<BoolValue>("Maximization", "True if the current problem is a maximization problem, otherwise false."));
    6262      Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("Quality", "The quality value contained in each sub-scope which is used for selection."));
     63      CopySelectedParameter.Hidden = true;
    6364    }
    6465  }
Note: See TracChangeset for help on using the changeset viewer.