andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

better class name

This commit is contained in:
rusefi 2018-09-02 19:14:49 -04:00
parent 436a060031
commit 4b8ef855d9
7 changed files with 46 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
java_console/models/src/com/rusefi/autotune/stDataOnline.java → java_console/models/src/com/rusefi/autotune/AfrDataPoint.java
View File

@ -3,17 +3,19 @@ package com.rusefi.autotune;
import com.rusefi.config.Fields; import com.rusefi.config.Fields;
/** /**
* Air/Fuel ratio data point
*
* (c) Andrey Belomutskiy 2013-2017 * (c) Andrey Belomutskiy 2013-2017
* 2/23/2016. * 2/23/2016.
*/ */
public class stDataOnline { public class AfrDataPoint {
public final double AFR; public final double AFR;
private final int rpm; private final int rpm;
private final double engineLoad; private final double engineLoad;
int rpmIndex; int rpmIndex;
int engineLoadIndex; int engineLoadIndex;
public stDataOnline(double AFR, int rpmIndex, int engineLoadIndex, int rpm, double engineLoad) { public AfrDataPoint(double AFR, int rpmIndex, int engineLoadIndex, int rpm, double engineLoad) {
this.rpm = rpm; this.rpm = rpm;
this.engineLoad = engineLoad; this.engineLoad = engineLoad;
if (rpmIndex < 0 || rpmIndex >= Fields.FUEL_RPM_COUNT) if (rpmIndex < 0 || rpmIndex >= Fields.FUEL_RPM_COUNT)
@ -25,12 +27,12 @@ public class stDataOnline {
this.engineLoadIndex = engineLoadIndex; this.engineLoadIndex = engineLoadIndex;
} }
public static stDataOnline valueOf(double AFR, int rpm, double engineLoad) { public static AfrDataPoint valueOf(double afr, int rpm, double engineLoad) {
int rpmIndex = (int) (rpm / 7000.0 * FuelAutoTune.SIZE); int rpmIndex = (int) (rpm / 7000.0 * FuelAutoTune.SIZE);
if (rpmIndex < 0 || rpmIndex >= Fields.FUEL_RPM_COUNT) if (rpmIndex < 0 || rpmIndex >= Fields.FUEL_RPM_COUNT)
return null; return null;
int engineLoadIndex = (int) (engineLoad / 120.0 * FuelAutoTune.SIZE); int engineLoadIndex = (int) (engineLoad / 120.0 * FuelAutoTune.SIZE);
return new stDataOnline(AFR, rpmIndex, engineLoadIndex, rpm, engineLoad); return new AfrDataPoint(afr, rpmIndex, engineLoadIndex, rpm, engineLoad);
} }
int getRpmIndex() { int getRpmIndex() {

2
java_console/models/src/com/rusefi/autotune/FuelAutoLogic.java
View File

@ -8,5 +8,5 @@ import java.util.Collection;
*/ */
public interface FuelAutoLogic { public interface FuelAutoLogic {
// void MainWindow::calckGBC(double STEP) // void MainWindow::calckGBC(double STEP)
Result process(boolean smooth, Collection<stDataOnline> dataECU, double STEP, double targetAFR, float[][] kgbcINIT); Result process(boolean smooth, Collection<AfrDataPoint> dataECU, double STEP, double targetAFR, float[][] kgbcINIT);
} }

8
java_console/models/src/com/rusefi/autotune/FuelAutoTune.java
View File

@ -25,7 +25,7 @@ public enum FuelAutoTune implements FuelAutoLogic {
// void MainWindow::calckGBC(double STEP) // void MainWindow::calckGBC(double STEP)
@Override @Override
public Result process(boolean smooth, Collection<stDataOnline> dataECU, double STEP, double targetAFR, float[][] kgbcINIT) { public Result process(boolean smooth, Collection<AfrDataPoint> dataECU, double STEP, double targetAFR, float[][] kgbcINIT) {
float kgbcSQ[][] = new float[SIZE][SIZE]; float kgbcSQ[][] = new float[SIZE][SIZE];
double kgbcSQsum = 0; double kgbcSQsum = 0;
double kgbcSQsumLast; double kgbcSQsumLast;
@ -40,7 +40,7 @@ public enum FuelAutoTune implements FuelAutoLogic {
// let's could how many data points we have for each cell // let's could how many data points we have for each cell
int bkGBC[][] = new int[Fields.FUEL_LOAD_COUNT][Fields.FUEL_RPM_COUNT]; int bkGBC[][] = new int[Fields.FUEL_LOAD_COUNT][Fields.FUEL_RPM_COUNT];
for (stDataOnline data : dataECU) { for (AfrDataPoint data : dataECU) {
bkGBC[data.PRESS_RT_32()][data.RPM_RT_32()]++; bkGBC[data.PRESS_RT_32()][data.RPM_RT_32()]++;
} }
@ -142,8 +142,8 @@ public enum FuelAutoTune implements FuelAutoLogic {
} }
} }
private static void countDeviation(Collection<stDataOnline> dataECU, float[][] kgbcSQ, float[][] kgbcRES, float[][] kgbcINIT, double targetAFR) { private static void countDeviation(Collection<AfrDataPoint> dataECU, float[][] kgbcSQ, float[][] kgbcRES, float[][] kgbcINIT, double targetAFR) {
for (stDataOnline dataPoint : dataECU) { for (AfrDataPoint dataPoint : dataECU) {
double corrInit = 1; // addGbcTwatINIT_190[dataPoint.twat + 40]; double corrInit = 1; // addGbcTwatINIT_190[dataPoint.twat + 40];
double corrRes = 1; //addGbcTwatRES_190[dataPoint.twat + 40]; double corrRes = 1; //addGbcTwatRES_190[dataPoint.twat + 40];
double tpsCorrInit = 1; //ktgbcINIT[dataPoint.THR_RT_16][dataPoint.RPM_RT_32()]; double tpsCorrInit = 1; //ktgbcINIT[dataPoint.THR_RT_16][dataPoint.RPM_RT_32()];

8
java_console/models/src/com/rusefi/autotune/FuelAutoTune2.java
View File

@ -1,7 +1,5 @@
package com.rusefi.autotune; package com.rusefi.autotune;
import com.rusefi.config.Fields;
import java.util.Collection; import java.util.Collection;
/** /**
@ -15,12 +13,12 @@ public enum FuelAutoTune2 implements FuelAutoLogic {
@Override @Override
public Result process(boolean smooth, Collection<stDataOnline> dataECU, double GRAD, double targetAFR, float[][] VEcur) { public Result process(boolean smooth, Collection<AfrDataPoint> dataECU, double GRAD, double targetAFR, float[][] VEcur) {
float result[][] = new float[SIZE][SIZE]; float result[][] = new float[SIZE][SIZE];
// proverka na statichnost' rezhimnoy tochki // proverka na statichnost' rezhimnoy tochki
boolean fl_static = true; boolean fl_static = true;
for (stDataOnline dataPoint : dataECU) { for (AfrDataPoint dataPoint : dataECU) {
// TODO // TODO
// proverka idet po trem poslednim dannym v dataECU // proverka idet po trem poslednim dannym v dataECU
// proverka po rpmIndex // proverka po rpmIndex
@ -32,7 +30,7 @@ public enum FuelAutoTune2 implements FuelAutoLogic {
if (!fl_static) if (!fl_static)
return null; return null;
// end // end
stDataOnline s = dataECU.iterator().next(); AfrDataPoint s = dataECU.iterator().next();
double delta = (s.AFR - targetAFR) / targetAFR; // privedennoe otklonenie po toplivu double delta = (s.AFR - targetAFR) / targetAFR; // privedennoe otklonenie po toplivu

25
java_console/models/src/com/rusefi/autotune/test/FuelAutoTune2Test.java
View File

@ -2,8 +2,7 @@ package com.rusefi.autotune.test;
import com.rusefi.autotune.FuelAutoTune2; import com.rusefi.autotune.FuelAutoTune2;
import com.rusefi.autotune.Result; import com.rusefi.autotune.Result;
import com.rusefi.autotune.stDataOnline; import com.rusefi.autotune.AfrDataPoint;
import com.rusefi.config.Fields;
import org.junit.Test; import org.junit.Test;
import java.util.ArrayList; import java.util.ArrayList;
@ -19,35 +18,35 @@ public class FuelAutoTune2Test {
@Test @Test
public void testAutoTune() { public void testAutoTune() {
List<stDataOnline> dataPoints = new ArrayList<>(); List<AfrDataPoint> dataPoints = new ArrayList<>();
dataPoints.add(stDataOnline.valueOf(13, 1200, 80)); dataPoints.add(AfrDataPoint.valueOf(13, 1200, 80));
{ {
System.out.println("Running with one datapoint already at target AFR"); System.out.println("Running with one datapoint already at target AFR");
Result r = FuelAutoTune2.INSTANCE.process(false, dataPoints, 0.1, 13, createVeTable()); Result r = FuelAutoTune2.INSTANCE.process(false, dataPoints, 0.1, 13, createVeTable(1));
FuelAutoTuneTest.printNotDefault(r.getKgbcRES(), 1); FuelAutoTuneTest.printNotDefault(r.getKgbcRES(), 1);
} }
dataPoints.add(stDataOnline.valueOf(13, 1200, 80)); dataPoints.add(AfrDataPoint.valueOf(13, 1200, 80));
dataPoints.add(stDataOnline.valueOf(14, 1300, 60)); dataPoints.add(AfrDataPoint.valueOf(14, 1300, 60));
dataPoints.add(stDataOnline.valueOf(15, 1400, 70)); dataPoints.add(AfrDataPoint.valueOf(15, 1400, 70));
dataPoints.add(stDataOnline.valueOf(16, 1500, 90)); dataPoints.add(AfrDataPoint.valueOf(16, 1500, 90));
for (int i = 0; i < 2000; i++) for (int i = 0; i < 2000; i++)
dataPoints.add(stDataOnline.valueOf(16, 1500 + i, 90)); dataPoints.add(AfrDataPoint.valueOf(16, 1500 + i, 90));
{ {
System.out.println("Running with more datapoints"); System.out.println("Running with more datapoints");
Result r = FuelAutoTune2.INSTANCE.process(false, dataPoints, 0.01, 13, createVeTable()); Result r = FuelAutoTune2.INSTANCE.process(false, dataPoints, 0.01, 13, createVeTable(1));
FuelAutoTuneTest.printNotDefault(r.getKgbcRES(), 1); FuelAutoTuneTest.printNotDefault(r.getKgbcRES(), 1);
} }
for (int i = 0; i < 2000; i++) for (int i = 0; i < 2000; i++)
dataPoints.add(stDataOnline.valueOf(15, 1500 + i, 90)); dataPoints.add(AfrDataPoint.valueOf(15, 1500 + i, 90));
{ {
System.out.println("Running with more datapoints"); System.out.println("Running with more datapoints");
Result r = FuelAutoTune2.INSTANCE.process(false, dataPoints, 0.01, 13, createVeTable()); Result r = FuelAutoTune2.INSTANCE.process(false, dataPoints, 0.01, 13, createVeTable(1));
FuelAutoTuneTest.printNotDefault(r.getKgbcRES(), 1); FuelAutoTuneTest.printNotDefault(r.getKgbcRES(), 1);
} }

28
java_console/models/src/com/rusefi/autotune/test/FuelAutoTuneTest.java
View File

@ -2,7 +2,7 @@ package com.rusefi.autotune.test;
import com.rusefi.autotune.FuelAutoTune; import com.rusefi.autotune.FuelAutoTune;
import com.rusefi.autotune.Result; import com.rusefi.autotune.Result;
import com.rusefi.autotune.stDataOnline; import com.rusefi.autotune.AfrDataPoint;
import com.rusefi.config.Fields; import com.rusefi.config.Fields;
import org.junit.Test; import org.junit.Test;
@ -17,32 +17,32 @@ public class FuelAutoTuneTest {
@Test @Test
public void testAutoTune() { public void testAutoTune() {
List<stDataOnline> dataPoints = new ArrayList<>(); List<AfrDataPoint> dataPoints = new ArrayList<>();
dataPoints.add(stDataOnline.valueOf(13, 1200, 80)); dataPoints.add(AfrDataPoint.valueOf(13, 1200, 80));
{ {
Result r = FuelAutoTune.INSTANCE.process(false, dataPoints, 0.1, 13, createVeTable()); Result r = FuelAutoTune.INSTANCE.process(false, dataPoints, 0.1, 13, createVeTable(1));
printNotDefault(r.getKgbcRES(), 1); printNotDefault(r.getKgbcRES(), 1);
} }
dataPoints.add(stDataOnline.valueOf(13, 1200, 80)); dataPoints.add(AfrDataPoint.valueOf(13, 1200, 80));
dataPoints.add(stDataOnline.valueOf(14, 1300, 60)); dataPoints.add(AfrDataPoint.valueOf(14, 1300, 60));
dataPoints.add(stDataOnline.valueOf(15, 1400, 70)); dataPoints.add(AfrDataPoint.valueOf(15, 1400, 70));
dataPoints.add(stDataOnline.valueOf(16, 1500, 90)); dataPoints.add(AfrDataPoint.valueOf(16, 1500, 90));
for (int i = 0; i < 2000; i++) for (int i = 0; i < 2000; i++)
dataPoints.add(stDataOnline.valueOf(16, 1500 + i, 90)); dataPoints.add(AfrDataPoint.valueOf(16, 1500 + i, 90));
{ {
Result r = FuelAutoTune.INSTANCE.process(false, dataPoints, 0.01, 13, createVeTable()); Result r = FuelAutoTune.INSTANCE.process(false, dataPoints, 0.01, 13, createVeTable(1));
printNotDefault(r.getKgbcRES(), 1); printNotDefault(r.getKgbcRES(), 1);
} }
for (int i = 0; i < 2000; i++) for (int i = 0; i < 2000; i++)
dataPoints.add(stDataOnline.valueOf(15, 1500 + i, 90)); dataPoints.add(AfrDataPoint.valueOf(15, 1500 + i, 90));
{ {
Result r = FuelAutoTune.INSTANCE.process(false, dataPoints, 0.01, 13, createVeTable()); Result r = FuelAutoTune.INSTANCE.process(false, dataPoints, 0.01, 13, createVeTable(1));
printNotDefault(r.getKgbcRES(), 1); printNotDefault(r.getKgbcRES(), 1);
} }
@ -67,11 +67,11 @@ public class FuelAutoTuneTest {
} }
} }
static float[][] createVeTable() { static float[][] createVeTable(int value) {
float veMap[][] = new float[Fields.FUEL_LOAD_COUNT][Fields.FUEL_RPM_COUNT]; float veMap[][] = new float[Fields.FUEL_LOAD_COUNT][Fields.FUEL_RPM_COUNT];
for (int engineLoadIndex = 0; engineLoadIndex < Fields.FUEL_LOAD_COUNT; engineLoadIndex++) { for (int engineLoadIndex = 0; engineLoadIndex < Fields.FUEL_LOAD_COUNT; engineLoadIndex++) {
for (int rpmIndex = 0; rpmIndex < Fields.FUEL_RPM_COUNT; rpmIndex++) { for (int rpmIndex = 0; rpmIndex < Fields.FUEL_RPM_COUNT; rpmIndex++) {
veMap[engineLoadIndex][rpmIndex] = 1; veMap[engineLoadIndex][rpmIndex] = value;
} }
} }
return veMap; return veMap;

12
java_console/ui/src/com/rusefi/ui/FuelTunePane.java
View File

@ -11,7 +11,7 @@ import com.rusefi.FileLog;
import com.rusefi.UploadChanges; import com.rusefi.UploadChanges;
import com.rusefi.autotune.FuelAutoTune; import com.rusefi.autotune.FuelAutoTune;
import com.rusefi.autotune.Result; import com.rusefi.autotune.Result;
import com.rusefi.autotune.stDataOnline; import com.rusefi.autotune.AfrDataPoint;
import com.rusefi.binaryprotocol.BinaryProtocol; import com.rusefi.binaryprotocol.BinaryProtocol;
import com.rusefi.binaryprotocol.BinaryProtocolHolder; import com.rusefi.binaryprotocol.BinaryProtocolHolder;
import com.rusefi.config.Fields; import com.rusefi.config.Fields;
@ -193,7 +193,7 @@ public class FuelTunePane {
loadMap(veTable, Fields.VETABLE.getOffset()); loadMap(veTable, Fields.VETABLE.getOffset());
logMap("source", veTable); logMap("source", veTable);
List<stDataOnline> data = new ArrayList<>(); List<AfrDataPoint> data = new ArrayList<>();
synchronized (incomingDataPoints) { synchronized (incomingDataPoints) {
for (FuelDataPoint point : incomingDataPoints) for (FuelDataPoint point : incomingDataPoints)
data.add(point.asDataOnline()); data.add(point.asDataOnline());
@ -212,14 +212,14 @@ public class FuelTunePane {
upload.setEnabled(true); upload.setEnabled(true);
} }
private void writeDataPoints(List<stDataOnline> data) { private void writeDataPoints(List<AfrDataPoint> data) {
DataOutputStream dos = getTuneLogStream(); DataOutputStream dos = getTuneLogStream();
if (dos == null) if (dos == null)
return; return;
try { try {
dos.writeBytes("Running with " + data.size() + " points\r\n"); dos.writeBytes("Running with " + data.size() + " points\r\n");
dos.writeBytes("AFR\tRPM\tload\r\n"); dos.writeBytes("AFR\tRPM\tload\r\n");
for (stDataOnline point : data) for (AfrDataPoint point : data)
dos.writeBytes(point.AFR +"\t" + point.getRpm() + "\t" + point.getEngineLoad() + "\r\n"); dos.writeBytes(point.AFR +"\t" + point.getRpm() + "\t" + point.getEngineLoad() + "\r\n");
} catch (IOException e) { } catch (IOException e) {
@ -360,8 +360,8 @@ public class FuelTunePane {
engineLoadIndex = Math.max(0, BinarySearch.binarySearch(engineLoad, veLoadBins)); engineLoadIndex = Math.max(0, BinarySearch.binarySearch(engineLoad, veLoadBins));
} }
public stDataOnline asDataOnline() { public AfrDataPoint asDataOnline() {
return new stDataOnline(afr, rpmIndex, engineLoadIndex, rpm, engineLoad); return new AfrDataPoint(afr, rpmIndex, engineLoadIndex, rpm, engineLoad);
} }
} }
} }