caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

use default functions in constraint interface

Browse source
This commit is contained in:
Milos Kozak 2018-03-22 21:31:32 +01:00
parent 76ee3c51e4
commit ae57241833
5 changed files with 27 additions and 140 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
app/src/main/java/info/nightscout/androidaps/interfaces/ConstraintsInterface.java
View file

@ -7,23 +7,41 @@ import info.nightscout.androidaps.data.Profile;
*/
public interface ConstraintsInterface {
Constraint<Boolean> isLoopInvokationAllowed(Constraint<Boolean> value);
default Constraint<Boolean> isLoopInvokationAllowed(Constraint<Boolean> value) {
return value;
}
Constraint<Boolean> isClosedLoopAllowed(Constraint<Boolean> value);
default Constraint<Boolean> isClosedLoopAllowed(Constraint<Boolean> value) {
return value;
}
Constraint<Boolean> isAutosensModeEnabled(Constraint<Boolean> value);
default Constraint<Boolean> isAutosensModeEnabled(Constraint<Boolean> value) {
return value;
}
Constraint<Boolean> isAMAModeEnabled(Constraint<Boolean> value);
default Constraint<Boolean> isAMAModeEnabled(Constraint<Boolean> value) {
return value;
}
Constraint<Boolean> isSMBModeEnabled(Constraint<Boolean> value);
default Constraint<Boolean> isSMBModeEnabled(Constraint<Boolean> value) {
return value;
}
Constraint<Double> applyBasalConstraints(Constraint<Double> absoluteRate, Profile profile);
default Constraint<Double> applyBasalConstraints(Constraint<Double> absoluteRate, Profile profile) {
return absoluteRate;
}
Constraint<Integer> applyBasalPercentConstraints(Constraint<Integer> percentRate, Profile profile);
default Constraint<Integer> applyBasalPercentConstraints(Constraint<Integer> percentRate, Profile profile) {
return percentRate;
}
Constraint<Double> applyBolusConstraints(Constraint<Double> insulin);
default Constraint<Double> applyBolusConstraints(Constraint<Double> insulin) {
return insulin;
}
Constraint<Integer> applyCarbsConstraints(Constraint<Integer> carbs);
default Constraint<Integer> applyCarbsConstraints(Constraint<Integer> carbs) {
return carbs;
}
default Constraint<Double> applyMaxIOBConstraints(Constraint<Double> maxIob) {
return maxIob;

40
app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java
View file

@ -1432,46 +1432,6 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf
return value;
}
@Override
public Constraint<Boolean> isClosedLoopAllowed(Constraint<Boolean> value) {
return value;
}
@Override
public Constraint<Boolean> isAutosensModeEnabled(Constraint<Boolean> value) {
return value;
}
@Override
public Constraint<Boolean> isAMAModeEnabled(Constraint<Boolean> value) {
return value;
}
@Override
public Constraint<Boolean> isSMBModeEnabled(Constraint<Boolean> value) {
return value;
}
@Override
public Constraint<Double> applyBasalConstraints(Constraint<Double> absoluteRate, Profile profile) {
return absoluteRate;
}
@Override
public Constraint<Integer> applyBasalPercentConstraints(Constraint<Integer> percentRate, Profile profile) {
return percentRate;
}
@Override
public Constraint<Double> applyBolusConstraints(Constraint<Double> insulin) {
return insulin;
}
@Override
public Constraint<Integer> applyCarbsConstraints(Constraint<Integer> carbs) {
return carbs;
}
@Override
public Constraint<Double> applyMaxIOBConstraints(Constraint<Double> maxIob) {
if (lowSuspendOnlyLoopEnforcedUntil > System.currentTimeMillis())

30
app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/AbstractDanaRPlugin.java
View file

@ -433,31 +433,6 @@ public abstract class AbstractDanaRPlugin implements PluginBase, PumpInterface,
* Constraint interface
*/
@Override
public Constraint<Boolean> isLoopInvokationAllowed(Constraint<Boolean> value) {
return value;
}
@Override
public Constraint<Boolean> isClosedLoopAllowed(Constraint<Boolean> value) {
return value;
}
@Override
public Constraint<Boolean> isAutosensModeEnabled(Constraint<Boolean> value) {
return value;
}
@Override
public Constraint<Boolean> isAMAModeEnabled(Constraint<Boolean> value) {
return value;
}
@Override
public Constraint<Boolean> isSMBModeEnabled(Constraint<Boolean> value) {
return value;
}
@Override
public Constraint<Double> applyBasalConstraints(Constraint<Double> absoluteRate, Profile profile) {
if (pump != null)
@ -480,11 +455,6 @@ public abstract class AbstractDanaRPlugin implements PluginBase, PumpInterface,
return insulin;
}
@Override
public Constraint<Integer> applyCarbsConstraints(Constraint<Integer> carbs) {
return carbs;
}
@Nullable
@Override
public ProfileStore getProfile() {

30
app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/DanaRSPlugin.java
View file

@ -272,31 +272,6 @@ public class DanaRSPlugin implements PluginBase, PumpInterface, DanaRInterface,
// Constraints interface
@Override
public Constraint<Boolean> isLoopInvokationAllowed(Constraint<Boolean> value) {
return value;
}
@Override
public Constraint<Boolean> isClosedLoopAllowed(Constraint<Boolean> value) {
return value;
}
@Override
public Constraint<Boolean> isAutosensModeEnabled(Constraint<Boolean> value) {
return value;
}
@Override
public Constraint<Boolean> isAMAModeEnabled(Constraint<Boolean> value) {
return value;
}
@Override
public Constraint<Boolean> isSMBModeEnabled(Constraint<Boolean> value) {
return value;
}
@Override
public Constraint<Double> applyBasalConstraints(Constraint<Double> absoluteRate, Profile profile) {
if (pump != null)
@ -320,11 +295,6 @@ public class DanaRSPlugin implements PluginBase, PumpInterface, DanaRInterface,
return insulin;
}
@Override
public Constraint<Integer> applyCarbsConstraints(Constraint<Integer> carbs) {
return carbs;
}
// Profile interface
@Nullable

31
app/src/main/java/info/nightscout/androidaps/plugins/PumpInsight/InsightPumpPlugin.java
View file

@ -1088,31 +1088,6 @@ public class InsightPumpPlugin implements PluginBase, PumpInterface, Constraints
// Constraints
@Override
public Constraint<Boolean> isLoopInvokationAllowed(Constraint<Boolean> value) {
return value;
}
@Override
public Constraint<Boolean> isClosedLoopAllowed(Constraint<Boolean> value) {
return value;
}
@Override
public Constraint<Boolean> isAutosensModeEnabled(Constraint<Boolean> value) {
return value;
}
@Override
public Constraint<Boolean> isAMAModeEnabled(Constraint<Boolean> value) {
return value;
}
@Override
public Constraint<Boolean> isSMBModeEnabled(Constraint<Boolean> value) {
return value;
}
@Override
public Constraint<Double> applyBasalConstraints(Constraint<Double> absoluteRate, Profile profile) {
if (statusResult != null) {
@ -1136,10 +1111,4 @@ public class InsightPumpPlugin implements PluginBase, PumpInterface, Constraints
return insulin;
}
@Override
public Constraint<Integer> applyCarbsConstraints(Constraint<Integer> carbs) {
return carbs;
}
}