diff --git a/java_console/models/src/com/rusefi/autotune/FuelAutoTune.java b/java_console/models/src/com/rusefi/autotune/FuelAutoTune.java index ef93f47f8e..10082620d7 100644 --- a/java_console/models/src/com/rusefi/autotune/FuelAutoTune.java +++ b/java_console/models/src/com/rusefi/autotune/FuelAutoTune.java @@ -156,10 +156,10 @@ public enum FuelAutoTune implements FuelAutoLogic { // if (isLogEnabled()) // log("r=" + r + "/c=" + c + ": tmp=" + tmp); - kgbcSQ[dataPoint.PRESS_RT_32()][dataPoint.RPM_RT_32()] += tmp * tmp; +// kgbcSQ[dataPoint.PRESS_RT_32()][dataPoint.RPM_RT_32()] += tmp * tmp; todo: what is this deviation called? + kgbcSQ[dataPoint.PRESS_RT_32()][dataPoint.RPM_RT_32()] += Math.abs(tmp); // todo: what is this deviation called? } } - private static double smooth(double kgbcSQsum, double ksq, double ke, double kg, float[][] kgbcRES) { double e; double g; diff --git a/java_console/models/src/com/rusefi/autotune/test/FuelAutoTune2Test.java b/java_console/models/src/com/rusefi/autotune/test/FuelAutoTune2Test.java index d112c3425d..57f7f71e37 100644 --- a/java_console/models/src/com/rusefi/autotune/test/FuelAutoTune2Test.java +++ b/java_console/models/src/com/rusefi/autotune/test/FuelAutoTune2Test.java @@ -21,8 +21,9 @@ public class FuelAutoTune2Test { dataPoints.add(stDataOnline.valueOf(13, 1200, 80)); { + System.out.println("Running with one datapoint"); Result r = FuelAutoTune2.INSTANCE.process(false, dataPoints, 0.1, 13, createVeTable()); - printNotDefault(r.getKgbcRES(), 1); + FuelAutoTuneTest.printNotDefault(r.getKgbcRES(), 1); } dataPoints.add(stDataOnline.valueOf(13, 1200, 80)); @@ -34,16 +35,18 @@ public class FuelAutoTune2Test { dataPoints.add(stDataOnline.valueOf(16, 1500 + i, 90)); { + System.out.println("Running with more datapoints"); Result r = FuelAutoTune2.INSTANCE.process(false, dataPoints, 0.01, 13, createVeTable()); - printNotDefault(r.getKgbcRES(), 1); + FuelAutoTuneTest.printNotDefault(r.getKgbcRES(), 1); } for (int i = 0; i < 2000; i++) dataPoints.add(stDataOnline.valueOf(15, 1500 + i, 90)); { + System.out.println("Running with more datapoints"); Result r = FuelAutoTune2.INSTANCE.process(false, dataPoints, 0.01, 13, createVeTable()); - printNotDefault(r.getKgbcRES(), 1); + FuelAutoTuneTest.printNotDefault(r.getKgbcRES(), 1); } @@ -51,22 +54,6 @@ public class FuelAutoTune2Test { } - /** - * this method prints all values which do not equal default value - */ - private static void printNotDefault(float[][] array, double defaultValue) { - for (int i = 0; i < array.length; i++) { - printNotDefault(array[i], i, defaultValue); - } - } - - private static void printNotDefault(float[] array, int index, double defaultValue) { - for (int i = 0; i < array.length; i++) { - if (array[i] != defaultValue) - System.out.println("Found value: " + index + " " + i + ": " + array[i]); - } - } - private static float[][] createVeTable() { float kgbcINIT[][] = new float[Fields.FUEL_LOAD_COUNT][Fields.FUEL_RPM_COUNT]; for (int engineLoadIndex = 0; engineLoadIndex < Fields.FUEL_LOAD_COUNT; engineLoadIndex++) { diff --git a/java_console/models/src/com/rusefi/autotune/test/FuelAutoTuneTest.java b/java_console/models/src/com/rusefi/autotune/test/FuelAutoTuneTest.java index 4a06b9f2fc..fe7321f4e5 100644 --- a/java_console/models/src/com/rusefi/autotune/test/FuelAutoTuneTest.java +++ b/java_console/models/src/com/rusefi/autotune/test/FuelAutoTuneTest.java @@ -54,7 +54,7 @@ public class FuelAutoTuneTest { /** * this method prints all values which do not equal default value */ - private static void printNotDefault(float[][] array, double defaultValue) { + static void printNotDefault(float[][] array, double defaultValue) { for (int i = 0; i < array.length; i++) { printNotDefault(array[i], i, defaultValue); } @@ -63,7 +63,7 @@ public class FuelAutoTuneTest { private static void printNotDefault(float[] array, int index, double defaultValue) { for (int i = 0; i < array.length; i++) { if (array[i] != defaultValue) - System.out.println("Found value: " + index + " " + i + ": " + array[i]); + System.out.println("Found value: x=" + index + " y=" + i + ": " + array[i]); } }