Changeset 5333

Timestamp:

01/19/11 16:22:50 (14 years ago)

Author:

gkronber

Message:

Implemented type coherent grammar. #1387

Location:

trunk/sources

Files:

• HeuristicLab.Problems.DataAnalysis.Classification/3.3/Symbolic/SymbolicClassificationProblem.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis/3.3/HeuristicLab.Problems.DataAnalysis-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/TypeCoherentExpressionGrammar.cs (added)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Classification/3.3/Symbolic/SymbolicClassificationProblem.cs

@@ -181 +181 @@
     }
 
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      RegisterParameterEvents();
+    }
+
     private void RegisterParameterEvents() {
       SolutionCreator.SymbolicExpressionTreeParameter.ActualNameChanged += new EventHandler(SolutionCreator_SymbolicExpressionTreeParameter_ActualNameChanged);
@@ -217 +222 @@
 
     private void FunctionTreeGrammarParameter_ValueChanged(object sender, System.EventArgs e) {
-      if (!(FunctionTreeGrammar is GlobalSymbolicExpressionGrammar))
+      if (!(FunctionTreeGrammar is GlobalSymbolicExpressionGrammar)) {
         FunctionTreeGrammar = new GlobalSymbolicExpressionGrammar(FunctionTreeGrammar);
+      }
       OnGrammarChanged();
     }

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/HeuristicLab.Problems.DataAnalysis-3.3.csproj

@@ -108 +108 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Symbolic\TypeCoherentExpressionGrammar.cs" />
     <Compile Include="Symbolic\Symbols\Power.cs" />
     <Compile Include="TableFileParser.cs" />
@@ -256 +257 @@
     </BootstrapperPackage>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Operators\" />
-  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.