Database and IO Simulation working

This commit is contained in:
Patrick McDonagh
2017-02-02 18:01:18 -06:00
parent 3093ddcdd9
commit 2730d2ee0f
22 changed files with 789 additions and 296 deletions

View File

@@ -22,7 +22,7 @@ public class Card {
private int numPointsUsed;
//Card
private int strokeNumber;
private long strokeNumber;
private LPPair surfacePositionMax;
private LPPair surfacePositionMin;
private LPPair surfaceLoadMax;
@@ -57,7 +57,7 @@ public class Card {
private long strokeStartTime;
Card(int strokeNumber){
Card(long strokeNumber){
this.strokeNumber = strokeNumber;
strokeStartTime = System.currentTimeMillis();
}
@@ -98,7 +98,7 @@ public class Card {
return this.surfacePositionMax;
}
public int getStrokeNumber() {
public long getStrokeNumber() {
return strokeNumber;
}
@@ -310,7 +310,7 @@ public class Card {
if (fillageCalculated > 100)
fillageCalculated = 100.0;
fluidLoad = (downholeLoadMax.getLoad() - downholeLoadMin.getLoad()) - frictionEstimate;
fluidLoad = downholeLoadSpan - frictionEstimate;
pumpIntakePressure = fluidGradient * rodDepth - (fluidLoad / pumpArea);
//printf("PIP = %f * %f - (%f / %f) = %f\n", fluidGradient, rodDepth, fluidLoad, pumpArea, pumpIntakePressure);
fluidLevel = pumpIntakePressure / fluidGradient;