Changeset 8392

Timestamp:

08/02/12 15:35:57 (12 years ago)

Author:

mkommend

Message:

#1763: Merged trunk changes into HeuristicLab.TreeSimplifier branch.

Location:

branches/HeuristicLab.TreeSimplifier

Files:

• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views (modified) (1 prop)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4 (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Classification (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisExpressionTreeILEmittingInterpreter.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisExpressionTreeInterpreter.cs (modified) (1 diff)

branches/HeuristicLab.TreeSimplifier/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4

@@ -1 @@
-*.user
-Plugin.cs
 bin
 obj
+HeuristicLabEncodingsSymbolicExpressionTreeEncodingViewsPlugin.cs
+*.vs10x
+HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.4.csproj.user
+Plugin.cs
+*.user

@@ -1 @@
-*.user
-Plugin.cs
 bin
 obj
+HeuristicLabEncodingsSymbolicExpressionTreeEncodingViewsPlugin.cs
+*.vs10x
+HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.4.csproj.user
+Plugin.cs
+*.user

branches/HeuristicLab.TreeSimplifier/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisExpressionTreeILEmittingInterpreter.cs

@@ -806 +806 @@
 
     private byte MapSymbolToOpCode(ISymbolicExpressionTreeNode treeNode) {
-      if (symbolToOpcode.ContainsKey(treeNode.Symbol.GetType()))
-        return symbolToOpcode[treeNode.Symbol.GetType()];
-      else
+      byte opCode;
+      if (!symbolToOpcode.TryGetValue(treeNode.Symbol.GetType(), out opCode))
         throw new NotSupportedException("Symbol: " + treeNode.Symbol);
-    }
+      return opCode;
+    }
+
 
     public static double AiryA(double x) {

branches/HeuristicLab.TreeSimplifier/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisExpressionTreeInterpreter.cs

@@ -617 +617 @@
 
     private byte MapSymbolToOpCode(ISymbolicExpressionTreeNode treeNode) {
-      if (symbolToOpcode.ContainsKey(treeNode.Symbol.GetType()))
-        return symbolToOpcode[treeNode.Symbol.GetType()];
-      else
+      byte opCode;
+      if (!symbolToOpcode.TryGetValue(treeNode.Symbol.GetType(), out opCode))
         throw new NotSupportedException("Symbol: " + treeNode.Symbol);
+      return opCode;
     }
 

@@ -1 @@
-*.user
-Plugin.cs
 bin
 obj
+HeuristicLabEncodingsSymbolicExpressionTreeEncodingViewsPlugin.cs
+*.vs10x
+HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.4.csproj.user
+Plugin.cs
+*.user