Changeset 5796 for branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.3

Timestamp:

03/22/11 16:45:46 (13 years ago)

Author:

mkommend

Message:

#1418: Merged trunk changes into branch.

Location:

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic

Files:

• Formatters/SymbolicExpressionTreeMATLABFormatter.cs (modified) (3 diffs)
• Symbols/VariableCondition.cs (modified) (1 diff)
• Symbols/VariableConditionTreeNode.cs (modified) (1 diff)
• VariableFrequencyAnalyser.cs (modified) (1 diff)

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Formatters/SymbolicExpressionTreeMATLABFormatter.cs

@@ -84 +84 @@
         foreach (string variableName in variableNames)
           stringBuilder.AppendLine("  " + variableName + " = Data(:, ???);");
-        stringBuilder.AppendLine("  for "+CurrentIndexVariable+" = size(Data,1):-1:1");
-        stringBuilder.AppendLine("    Target_estimated("+CurrentIndexVariable+") = " + FormatRecursively(node.SubTrees[0]) + ";");
+        stringBuilder.AppendLine("  for " + CurrentIndexVariable + " = size(Data,1):-1:1");
+        stringBuilder.AppendLine("    Target_estimated(" + CurrentIndexVariable + ") = " + FormatRecursively(node.SubTrees[0]) + ";");
         stringBuilder.AppendLine("  end");
         stringBuilder.AppendLine("end");
@@ -98 +98 @@
         stringBuilder.AppendLine("  y = (f0 + 2*f1 - 2*f3 - f4) / 8;");
         stringBuilder.AppendLine("end");
+        stringBuilder.AppendLine("function y = sigmoid(slope, x, threshold, a, b)");
+        stringBuilder.AppendLine("  p = 1.0 / (1 + exp(-slope * (x - threshold)));");
+        stringBuilder.AppendLine("  y = p * a + (1-p) * b;");
+        stringBuilder.AppendLine("end");
+
         return stringBuilder.ToString();
       }
@@ -269 +274 @@
         stringBuilder.Append(FormatRecursively(node.SubTrees[0]));
         currentLag -= laggedNode.Lag;
+      } else if (symbol is VariableCondition) {
+        var varConditionNode = node as VariableConditionTreeNode;
+        stringBuilder.AppendLine(" sigmoid(" + varConditionNode.Slope.ToString(CultureInfo.InvariantCulture) + ", " +
+          varConditionNode.VariableName + LagToString(currentLag) + ", " +
+          varConditionNode.Threshold.ToString(CultureInfo.InvariantCulture) + ", " +
+          FormatRecursively(varConditionNode.SubTrees[0]) + ", " +
+          FormatRecursively(varConditionNode.SubTrees[1]) + ")");
       } else {
         stringBuilder.Append("ERROR");

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Symbols/VariableCondition.cs

@@ -144 +144 @@
     #region persistence and cloning
     [StorableConstructor]
-    private VariableCondition(bool deserializing) : base(deserializing) { }
+    private VariableCondition(bool deserializing)
+      : base(deserializing) {
+      variableNames = new List<string>();
+    }
     private VariableCondition(VariableCondition original, Cloner cloner)
       : base(original, cloner) {

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Symbols/VariableConditionTreeNode.cs

@@ -88 +88 @@
 
     public override string ToString() {
-      return variableName + " > " + threshold.ToString("E4") + Environment.NewLine +
-        "slope: " + slope.ToString("E4");
+      string thresholdString = threshold > 0 ? "+" + threshold.ToString("E4") : threshold.ToString("E4");
+      return "Sigmoid " + "(" + slope.ToString("E4") + ", " + variableName + thresholdString + ")";
     }
   }

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/VariableFrequencyAnalyser.cs

@@ -112 +112 @@
       var variableNames = from node in tree.IterateNodesPrefix().OfType<VariableTreeNode>()
                           select node.VariableName;
+      var variableNamesInConditions = from node in tree.IterateNodesPrefix().OfType<VariableConditionTreeNode>()
+                                      select node.VariableName;
 
-      foreach (var variableName in variableNames) {
+      foreach (var variableName in variableNames.Concat(variableNamesInConditions)) {
         if (!references.ContainsKey(variableName)) {
           references[variableName] = 1;