Changeset 8936


Ignore:
Timestamp:
11/22/12 15:20:00 (10 years ago)
Author:
mkommend
Message:

#1865: Correcting updating of variable names in VariableSymbol.

Location:
trunk/sources
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/VariableView.cs

    r8853 r8936  
    124124    private void UpdateContent() {
    125125      if (Content != null) {
     126        Content.Fixed = true;
    126127        DeregisterContentEvents();
    127128        Content.VariableNames = variableNamesView.Content.CheckedItems.Select(x => x.Value).ToList();
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisProblem.cs

    r8853 r8936  
    211211      SymbolicExpressionTreeGrammar.MaximumFunctionDefinitions = MaximumFunctionDefinitions.Value;
    212212      foreach (var varSymbol in SymbolicExpressionTreeGrammar.Symbols.OfType<HeuristicLab.Problems.DataAnalysis.Symbolic.Variable>()) {
    213         if (!varSymbol.Fixed) varSymbol.AllVariableNames = ProblemData.AllowedInputVariables;
     213        if (!varSymbol.Fixed) {
     214          varSymbol.AllVariableNames = ProblemData.InputVariables.Select(x => x.Value);
     215          varSymbol.VariableNames = ProblemData.AllowedInputVariables;
     216        }
    214217      }
    215218      foreach (var varSymbol in SymbolicExpressionTreeGrammar.Symbols.OfType<HeuristicLab.Problems.DataAnalysis.Symbolic.VariableCondition>()) {
    216         if (!varSymbol.Fixed) varSymbol.AllVariableNames = ProblemData.AllowedInputVariables;
     219        if (!varSymbol.Fixed) {
     220          varSymbol.AllVariableNames = ProblemData.InputVariables.Select(x => x.Value);
     221          varSymbol.VariableNames = ProblemData.AllowedInputVariables;
     222        }
    217223      }
    218224    }
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/Variable.cs

    r8853 r8936  
    109109        allVariableNames.Clear();
    110110        allVariableNames.AddRange(value);
    111         VariableNames = value;
    112111      }
    113112    }
     
    170169    }
    171170
    172     protected override void OnChanged(EventArgs e) {
    173       if (@Fixed) {
    174         weightManipulatorMu = 1;
    175         weightManipulatorSigma = 0;
    176         weightMu = 1;
    177         weightSigma = 0;
    178         multiplicativeWeightManipulatorSigma = 0;
    179       }
    180       base.OnChanged(e);
    181     }
    182 
    183171    public override ISymbolicExpressionTreeNode CreateTreeNode() {
    184172      return new VariableTreeNode(this);
Note: See TracChangeset for help on using the changeset viewer.