Changeset 17571

Timestamp:

05/28/20 18:03:00 (5 years ago)

Author:

mkommend

Message:

#2521: Changed parameters to use readonly only for GUI manipulation.

Location:

branches/2521_ProblemRefactoring

Files:

• HeuristicLab.Encodings.RealVectorEncoding/3.3/RealVectorEncoding.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/BasicProblems/Encoding.cs (modified) (1 diff)
• HeuristicLab.Parameters.Views/3.3/ValueParameterView.cs (modified) (1 diff)
• HeuristicLab.Parameters/3.3/OptionalValueParameter.cs (modified) (1 diff)
• HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionProblem.cs (modified) (1 diff)

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.RealVectorEncoding/3.3/RealVectorEncoding.cs

@@ -103 +103 @@
       bounds[0, 1] = max;
 
-      lengthParameter = new FixedValueParameter<IntValue>(Name + ".Length", new IntValue(length));
-      boundsParameter = new ValueParameter<DoubleMatrix>(Name + ".Bounds", bounds);
+      lengthParameter = new FixedValueParameter<IntValue>(Name + ".Length", new IntValue(length)) { ReadOnly = true };
+      boundsParameter = new ValueParameter<DoubleMatrix>(Name + ".Bounds", bounds) { ReadOnly = true };
       Parameters.Add(lengthParameter);
       Parameters.Add(boundsParameter);

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Encoding.cs

@@ -95 +95 @@
     protected Encoding(string name)
       : base(name) {
-      Parameters.Add(new ValueParameter<ISolutionCreator<TEncodedSolution>>(name + ".SolutionCreator", "The operator to create a solution."));
+      Parameters.Add(new ValueParameter<ISolutionCreator<TEncodedSolution>>(name + ".SolutionCreator", "The operator to create a solution.") {
+        ReadOnly = true
+      });
       Parameters.Add(new FixedValueParameter<ReadOnlyItemSet<IOperator>>(name + ".Operators", "The operators that the encoding specifies.", encodingOperators.AsReadOnly()) {
-        GetsCollected = false
+        GetsCollected = false, ReadOnly = true
       });
 

branches/2521_ProblemRefactoring/HeuristicLab.Parameters.Views/3.3/ValueParameterView.cs

@@ -105 +105 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
+      ReadOnly = Content == null || Content.ReadOnly;
       setValueButton.Enabled = Content != null && !Content.ReadOnly && !(Content is IFixedValueParameter) && !ReadOnly;
       clearValueButton.Enabled = Content != null && !Content.ReadOnly && Content.Value != null && !(Content is IFixedValueParameter) && !(Content is ValueParameter<T>) && !ReadOnly;

branches/2521_ProblemRefactoring/HeuristicLab.Parameters/3.3/OptionalValueParameter.cs

@@ -44 +44 @@
     public virtual T Value {
       get { return this.value; }
-      set {
-        DoSetValue(value);
-      }
+      set { DoSetValue(value); }
     }
     private void DoSetValue(T value) {

branches/2521_ProblemRefactoring/HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionProblem.cs

@@ -177 +177 @@
     private void Parameterize() {
       var operators = new List<IItem>();
+
+      //TODO correct wiring code, because most of the parameters are wired in the encoding
       foreach (var op in Operators.OfType<PopulationSimilarityAnalyzer>()) {
         var calcs = Operators.OfType<ISolutionSimilarityCalculator>().ToArray();