Changeset 5022

Timestamp:

12/04/10 17:43:04 (14 years ago)

Author:

swinkler

Message:

Worked on MATLAB formatter, added special version of log function that behaves like Math.Log. (#1314)

File:

• branches/DataAnalysis.Extensions/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Formatters/SymbolicExpressionTreeMATLABFormatter.cs (modified) (2 diffs)

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

@@ -59 +59 @@
           .Distinct()
           .OrderBy(x => x);
+        stringBuilder.AppendLine("function test_model");
         foreach (string variableName in variableNames)
-          stringBuilder.AppendLine(variableName + " = Data(:, ???);");
+          stringBuilder.AppendLine("  " + variableName + " = Data(:, ???);");
         stringBuilder.AppendLine();
-        stringBuilder.AppendLine("Target_estimated(i) = " + FormatRecursively(node.SubTrees[0]));
+        stringBuilder.AppendLine("  for i = size(Data,1):-1:1");
+        stringBuilder.AppendLine("    Target_estimated(i) = " + FormatRecursively(node.SubTrees[0]) + ";");
+        stringBuilder.AppendLine();
+        stringBuilder.AppendLine("function y = log_(x)");
+        stringBuilder.AppendLine("  if(x<=0) y = NaN;");
+        stringBuilder.AppendLine("  else     y = log(x);");
         return stringBuilder.ToString();
       }
@@ -148 +154 @@
         stringBuilder.Append(")-0.5)*2"); // MATLAB maps false and true to 0 and 1, resp., we map this result to -1.0 and +1.0, resp.
       } else if (symbol is Logarithm) {
-        stringBuilder.Append("log(");
+        stringBuilder.Append("log_(");
         stringBuilder.Append(FormatRecursively(node.SubTrees[0]));
         stringBuilder.Append(")");