small improvements/fixes/workarounds

pcfreak9000 · Jan 16, 2022 · 1626a80 · 1626a80
1 parent 457c0a7
commit 1626a80
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/src/main/java/de/pcfreak9000/command/SetCommand.java b/src/main/java/de/pcfreak9000/command/SetCommand.java
@@ -80,13 +80,21 @@ public Integer call() throws Exception {
                 return Main.CODE_ERROR;
             }
             DataTablet dt = (DataTablet) t;
-            dt.setValues(Arrays.stream(params).map((s) -> EvalEngine.get().parse(s)).toArray(IExpr[]::new));
-            dt.setErrors(Arrays.stream(errors).map((s) -> EvalEngine.get().parse(s)).toArray(IExpr[]::new));
+            dt.setValues(Arrays.stream(params).map((s) -> EvalEngine.get().parse(fixNr(s))).toArray(IExpr[]::new));
+            dt.setErrors(Arrays.stream(errors).map((s) -> EvalEngine.get().parse(fixNr(s))).toArray(IExpr[]::new));
             dt.setPreferredPropagation(preferredPropagation);
             dt.setDataUsage(dataUsage);
-            System.out.println("Set the value(s) of tablet '" + tabletName + "' to '" + Arrays.toString(params)
-                    + "' and the error(s) to '" + Arrays.toString(errors) + "'.");
+            System.out.println("Set the value(s) of tablet '" + tabletName + "' to '" + Arrays.toString(dt.values)
+                    + "' and the error(s) to '" + Arrays.toString(dt.errors) + "'.");
         }
         return Main.CODE_NORMAL;
     }
+    private String fixNr(String in) {
+        in = in.replace(',', '.');
+        if (in.contains("E")) {
+            String[] ar = in.split("E");
+            in = "((" + ar[0] + ")*10^(" + Main.evaluator().eval(ar[1]).toString() + "))";
+        }
+        return in;
+    }
 }
diff --git a/src/main/java/de/pcfreak9000/command/TexCommand.java b/src/main/java/de/pcfreak9000/command/TexCommand.java
@@ -78,11 +78,16 @@ public Integer call() {
                     variables[i] = function.getInternalFromVar(variables[i]);
                 }
             }
+            String prop = function.getErrorPropFunction(propType, variables);
+            String stt = prop;
+            for(String in : function.getInternalArgs()) {
+                stt = stt.replace(in, function.getVarFromInternal(in));
+            }
             System.out.println("TeXForm of the error propagation of the function '" + function.getFunctionOriginal()
                     + "' with respect to the variables " + Arrays.toString(function.getVarArgs()) + ":");
+            System.out.println(stt);//TODO make this better
             if (split == 0) {
                 ExprEvaluator eval = new ExprEvaluator();
-                String prop = function.getErrorPropFunction(propType, variables);
                 String texString = eval.eval("TeXForm[" + prop + "]").toString();
                 texString = prepareDeltaTexString(texString, variables);
                 texString = prepareRawTexString(texString, function);

diff --git a/src/main/java/de/pcfreak9000/main/DataTablet.java b/src/main/java/de/pcfreak9000/main/DataTablet.java
@@ -27,8 +27,8 @@ public static enum DataUsage {
         Raw, MSD/* Mean and standard deviation */
     }
 
-    private IExpr[] values;
-    private IExpr[] errors;
+    public IExpr[] values;
+    public IExpr[] errors;//TODO tmp public
 
     private PropagationType preferredPropagation = PropagationType.Linear;
     private DataUsage dataUsage;
@@ -150,4 +150,5 @@ public String toString() {
         return stringRepresentation();
     }
 
+
 }