Changeset 6803 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisProblem.cs

Timestamp:

09/20/11 11:12:10 (13 years ago)

Author:

mkommend

Message:

#1479: Merged grammar editor branch into trunk.

Location:

trunk/sources

Files:

• . (modified) (2 props)
• HeuristicLab.Problems.DataAnalysis.Symbolic (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisProblem.cs (modified) (1 diff)

trunk/sources

@@ -13 +13 @@
 *.vsp
 *.docstates
+bin
+HeuristicLab 3.3.6.0.ReSharper.user

@@ -13 +13 @@
 *.vsp
 *.docstates
+bin
+HeuristicLab 3.3.6.0.ReSharper.user

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisProblem.cs

@@ -190 +190 @@
       SymbolicExpressionTreeGrammar.MaximumFunctionDefinitions = MaximumFunctionDefinitions.Value;
       foreach (var varSymbol in SymbolicExpressionTreeGrammar.Symbols.OfType<HeuristicLab.Problems.DataAnalysis.Symbolic.Variable>()) {
-        varSymbol.VariableNames = ProblemData.AllowedInputVariables;
+        if (!varSymbol.Fixed) varSymbol.VariableNames = ProblemData.AllowedInputVariables;
       }
       foreach (var varSymbol in SymbolicExpressionTreeGrammar.Symbols.OfType<HeuristicLab.Problems.DataAnalysis.Symbolic.VariableCondition>()) {
-        varSymbol.VariableNames = ProblemData.AllowedInputVariables;
+        if (!varSymbol.Fixed) varSymbol.VariableNames = ProblemData.AllowedInputVariables;
       }
     }

@@ -13 +13 @@
 *.vsp
 *.docstates
+bin
+HeuristicLab 3.3.6.0.ReSharper.user