merge master into bug 5147

This commit is contained in:
Finn Huelsbusch
2022-10-03 09:53:35 +02:00
parent 9d1ad623e7
commit 1f1b3b8fef
106 changed files with 1308 additions and 456 deletions
@@ -7,15 +7,17 @@ public class SeriesParameters {
private boolean startswithZeroScore = false;
private int[] discardingThresholds = null;
private Integer maximumNumberOfDiscards = null;
private boolean oneAlwaysStaysOne;
public SeriesParameters(boolean firstColumnIsNonDiscardableCarryForward, boolean hasSplitFleetContiguousScoring,
boolean hasCrossFleetMergedRanking, boolean startswithZeroScore, int[] discardingThresholds, Integer maximumNumberOfDiscards) {
boolean hasCrossFleetMergedRanking, boolean startswithZeroScore, int[] discardingThresholds, Integer maximumNumberOfDiscards, boolean oneAlwaysStaysOne) {
this.firstColumnIsNonDiscardableCarryForward = firstColumnIsNonDiscardableCarryForward;
this.hasSplitFleetContiguousScoring = hasSplitFleetContiguousScoring;
this.hasCrossFleetMergedRanking = hasCrossFleetMergedRanking;
this.startswithZeroScore = startswithZeroScore;
this.discardingThresholds = discardingThresholds;
this.maximumNumberOfDiscards = maximumNumberOfDiscards;
this.oneAlwaysStaysOne = oneAlwaysStaysOne;
}
public boolean isFirstColumnIsNonDiscardableCarryForward() {
@@ -61,4 +63,8 @@ public class SeriesParameters {
public Integer getMaximumNumberOfDiscards() {
return maximumNumberOfDiscards;
}
public boolean isOneAlwaysStaysOne() {
return oneAlwaysStaysOne;
}
}