Skip to content

Commit 6476683

Browse files
nicolaspayettenicolaspayette
committed
rename Closure to TemporalClosure
1 parent b9871ba commit 6476683

File tree

7 files changed

+57
-45
lines changed

7 files changed

+57
-45
lines changed

‎POSEIDON/src/main/java/uk/ac/ox/oxfish/fisher/purseseiner/regulations/DefaultEpoRegulations.java

+16-4
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,20 @@ private DefaultEpoRegulations() {
4343
public static AlgorithmFactory<Regulations> make(final InputPath inputFolder) {
4444
final InputPath regions = inputFolder.path("regions");
4545
final List<Integer> yearsActive = ImmutableList.of(2021, 2022, 2023);
46-
final Closure closureA = new Closure(yearsActive, "closure A", CLOSURE_A_START, CLOSURE_A_END, 15);
47-
final Closure closureB = new Closure(yearsActive, "closure B", CLOSURE_B_START, CLOSURE_B_END, 15);
46+
final TemporalClosure closureA = new TemporalClosure(
47+
yearsActive,
48+
"closure A",
49+
CLOSURE_A_START,
50+
CLOSURE_A_END,
51+
15
52+
);
53+
final TemporalClosure closureB = new TemporalClosure(
54+
yearsActive,
55+
"closure B",
56+
CLOSURE_B_START,
57+
CLOSURE_B_END,
58+
15
59+
);
4860
return new NamedRegulations(
4961
ImmutableMap.of(
5062
"DEL licence", new ForbiddenIf(
@@ -76,8 +88,8 @@ public static AlgorithmFactory<Regulations> make(final InputPath inputFolder) {
7688
new InYear(2022),
7789
new AgentHasTag("extended_2022_closure"),
7890
new AnyOf(
79-
new ClosureExtensionBefore(closureA, 8),
80-
new ClosureExtensionAfter(closureB, 8)
91+
new TemporalClosureExtensionBefore(closureA, 8),
92+
new TemporalClosureExtensionAfter(closureB, 8)
8193
)
8294
)
8395
),

‎POSEIDON/src/main/java/uk/ac/ox/oxfish/fisher/purseseiner/regulations/IndividualBetLimits.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
public class IndividualBetLimits implements RegulationFactory, YearsActive {
1616

17-
private Closure closureA;
18-
private Closure closureB;
17+
private TemporalClosure closureA;
18+
private TemporalClosure closureB;
1919
private Map<Integer, Integer> additionalClosureDaysByExcessTonnesOfBet;
2020
private List<Integer> yearsActive;
2121

@@ -25,8 +25,8 @@ public IndividualBetLimits() {
2525

2626
@SuppressWarnings("WeakerAccess")
2727
public IndividualBetLimits(
28-
final Closure closureA,
29-
final Closure closureB,
28+
final TemporalClosure closureA,
29+
final TemporalClosure closureB,
3030
final Map<Integer, Integer> additionalClosureDaysByExcessTonnesOfBet,
3131
final List<Integer> yearsActive
3232
) {
@@ -47,22 +47,22 @@ public void setYearsActive(final List<Integer> yearsActive) {
4747
}
4848

4949
@SuppressWarnings("unused")
50-
public Closure getClosureA() {
50+
public TemporalClosure getClosureA() {
5151
return closureA;
5252
}
5353

5454
@SuppressWarnings("unused")
55-
public void setClosureA(final Closure closureA) {
55+
public void setClosureA(final TemporalClosure closureA) {
5656
this.closureA = closureA;
5757
}
5858

5959
@SuppressWarnings("unused")
60-
public Closure getClosureB() {
60+
public TemporalClosure getClosureB() {
6161
return closureB;
6262
}
6363

6464
@SuppressWarnings("unused")
65-
public void setClosureB(final Closure closureB) {
65+
public void setClosureB(final TemporalClosure closureB) {
6666
this.closureB = closureB;
6767
}
6868

@@ -93,7 +93,7 @@ public AlgorithmFactory<Regulations> get() {
9393
new LastYearlyFisherValue("Bigeye tuna Catches (kg)"),
9494
entry.getKey() * 1000 // convert from tonnes to kg
9595
),
96-
new ClosureExtensionBefore(
96+
new TemporalClosureExtensionBefore(
9797
closureA,
9898
entry.getValue()
9999
)
@@ -128,7 +128,7 @@ public AlgorithmFactory<Regulations> get() {
128128
)
129129
)
130130
),
131-
new ClosureExtensionAfter(closureB, entry.getValue())
131+
new TemporalClosureExtensionAfter(closureB, entry.getValue())
132132
)
133133
)
134134
)

‎POSEIDON/src/main/java/uk/ac/ox/oxfish/fisher/purseseiner/regulations/Closure.java ‎POSEIDON/src/main/java/uk/ac/ox/oxfish/fisher/purseseiner/regulations/TemporalClosure.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import static uk.ac.ox.oxfish.fisher.purseseiner.regulations.DefaultEpoRegulations.addDays;
1414
import static uk.ac.ox.oxfish.regulations.conditions.False.FALSE;
1515

16-
public class Closure implements RegulationFactory, YearsActive {
16+
public class TemporalClosure implements RegulationFactory, YearsActive {
1717
private List<Integer> yearsActive;
1818
private StringParameter agentTag;
1919
private IntegerParameter beginningDay;
@@ -23,11 +23,11 @@ public class Closure implements RegulationFactory, YearsActive {
2323
private IntegerParameter daysToForbidDeploymentsBefore;
2424

2525
@SuppressWarnings("unused")
26-
public Closure() {
26+
public TemporalClosure() {
2727
}
2828

2929
@SuppressWarnings({"WeakerAccess", "unused"})
30-
public Closure(
30+
public TemporalClosure(
3131
final List<Integer> yearsActive,
3232
final String agentTag,
3333
final MonthDay beginning,
@@ -46,7 +46,7 @@ public Closure(
4646
}
4747

4848
@SuppressWarnings("WeakerAccess")
49-
public Closure(
49+
public TemporalClosure(
5050
final List<Integer> yearsActive,
5151
final StringParameter agentTag,
5252
final IntegerParameter beginningDay,

‎POSEIDON/src/main/java/uk/ac/ox/oxfish/fisher/purseseiner/regulations/ClosureExtensionAfter.java ‎POSEIDON/src/main/java/uk/ac/ox/oxfish/fisher/purseseiner/regulations/TemporalClosureExtensionAfter.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,24 @@
1010
import static com.google.common.base.Preconditions.checkArgument;
1111
import static uk.ac.ox.oxfish.fisher.purseseiner.regulations.DefaultEpoRegulations.addDays;
1212

13-
public class ClosureExtensionAfter implements ConditionFactory {
14-
private Closure originalClosure;
13+
public class TemporalClosureExtensionAfter implements ConditionFactory {
14+
private TemporalClosure originalClosure;
1515
private IntegerParameter numberOfDaysToExtend;
1616

1717
@SuppressWarnings("unused")
18-
public ClosureExtensionAfter() {
18+
public TemporalClosureExtensionAfter() {
1919
}
2020

21-
public ClosureExtensionAfter(
22-
final Closure originalClosure,
21+
public TemporalClosureExtensionAfter(
22+
final TemporalClosure originalClosure,
2323
final int numberOfDaysToExtend
2424
) {
2525
this(originalClosure, new IntegerParameter(numberOfDaysToExtend));
2626
}
2727

2828
@SuppressWarnings("WeakerAccess")
29-
public ClosureExtensionAfter(
30-
final Closure originalClosure,
29+
public TemporalClosureExtensionAfter(
30+
final TemporalClosure originalClosure,
3131
final IntegerParameter numberOfDaysToExtend
3232
) {
3333
checkArgument(numberOfDaysToExtend.getIntValue() >= 1);
@@ -36,12 +36,12 @@ public ClosureExtensionAfter(
3636
}
3737

3838
@SuppressWarnings("unused")
39-
public Closure getOriginalClosure() {
39+
public TemporalClosure getOriginalClosure() {
4040
return originalClosure;
4141
}
4242

4343
@SuppressWarnings("unused")
44-
public void setOriginalClosure(final Closure originalClosure) {
44+
public void setOriginalClosure(final TemporalClosure originalClosure) {
4545
this.originalClosure = originalClosure;
4646
}
4747

‎POSEIDON/src/main/java/uk/ac/ox/oxfish/fisher/purseseiner/regulations/ClosureExtensionBefore.java ‎POSEIDON/src/main/java/uk/ac/ox/oxfish/fisher/purseseiner/regulations/TemporalClosureExtensionBefore.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -11,29 +11,29 @@
1111
import java.time.MonthDay;
1212

1313
import static com.google.common.base.Preconditions.checkArgument;
14-
import static uk.ac.ox.oxfish.fisher.purseseiner.regulations.Closure.forbidDeploymentsBefore;
1514
import static uk.ac.ox.oxfish.fisher.purseseiner.regulations.DefaultEpoRegulations.addDays;
15+
import static uk.ac.ox.oxfish.fisher.purseseiner.regulations.TemporalClosure.forbidDeploymentsBefore;
1616
import static uk.ac.ox.oxfish.regulations.conditions.False.FALSE;
1717

18-
public class ClosureExtensionBefore implements ConditionFactory {
19-
private Closure originalClosure;
18+
public class TemporalClosureExtensionBefore implements ConditionFactory {
19+
private TemporalClosure originalClosure;
2020
private IntegerParameter numberOfDaysToExtend;
2121

2222
@SuppressWarnings("unused")
23-
public ClosureExtensionBefore() {
23+
public TemporalClosureExtensionBefore() {
2424
}
2525

2626
@SuppressWarnings("WeakerAccess")
27-
public ClosureExtensionBefore(
28-
final Closure originalClosure,
27+
public TemporalClosureExtensionBefore(
28+
final TemporalClosure originalClosure,
2929
final int numberOfDaysToExtend
3030
) {
3131
this(originalClosure, new IntegerParameter(numberOfDaysToExtend));
3232
}
3333

3434
@SuppressWarnings("WeakerAccess")
35-
public ClosureExtensionBefore(
36-
final Closure originalClosure,
35+
public TemporalClosureExtensionBefore(
36+
final TemporalClosure originalClosure,
3737
final IntegerParameter numberOfDaysToExtend
3838
) {
3939
checkArgument(numberOfDaysToExtend.getIntValue() >= 1);
@@ -42,12 +42,12 @@ public ClosureExtensionBefore(
4242
}
4343

4444
@SuppressWarnings("unused")
45-
public Closure getOriginalClosure() {
45+
public TemporalClosure getOriginalClosure() {
4646
return originalClosure;
4747
}
4848

4949
@SuppressWarnings("unused")
50-
public void setOriginalClosure(final Closure originalClosure) {
50+
public void setOriginalClosure(final TemporalClosure originalClosure) {
5151
this.originalClosure = originalClosure;
5252
}
5353

‎POSEIDON/src/main/java/uk/ac/ox/oxfish/utility/AlgorithmFactories.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -689,8 +689,8 @@ public class AlgorithmFactories {
689689
Below.class,
690690
BetweenDates.class,
691691
BetweenYearlyDates.class,
692-
ClosureExtensionAfter.class,
693-
ClosureExtensionBefore.class,
692+
TemporalClosureExtensionAfter.class,
693+
TemporalClosureExtensionBefore.class,
694694
InRectangularArea.class,
695695
InYear.class,
696696
Not.class,
@@ -706,7 +706,7 @@ public class AlgorithmFactories {
706706
IndividualBetLimits.class, "Individual BET limits"
707707
),
708708
NamedRegulations.class,
709-
Closure.class,
709+
TemporalClosure.class,
710710
EverythingForbidden.class,
711711
EverythingPermitted.class,
712712
ForbiddenIf.class,

‎epo/src/main/java/uk/ac/ox/poseidon/epo/ExtendedClosurePolicies.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package uk.ac.ox.poseidon.epo;
22

33
import uk.ac.ox.oxfish.experiments.tuna.Policy;
4-
import uk.ac.ox.oxfish.fisher.purseseiner.regulations.Closure;
54
import uk.ac.ox.oxfish.fisher.purseseiner.regulations.IndividualBetLimits;
5+
import uk.ac.ox.oxfish.fisher.purseseiner.regulations.TemporalClosure;
66
import uk.ac.ox.oxfish.model.scenario.EpoScenario;
77
import uk.ac.ox.oxfish.regulations.NamedRegulations;
88
import uk.ac.ox.oxfish.utility.AlgorithmFactory;
@@ -32,18 +32,18 @@ public List<Policy<EpoScenario<?>>> get() {
3232
scenario -> {
3333
final NamedRegulations namedRegulations = (NamedRegulations) scenario.getRegulations();
3434
final Map<String, AlgorithmFactory<Regulations>> regulationMap = namedRegulations.getRegulations();
35-
final Closure closureA = (Closure) regulationMap.get("Closure A");
36-
final Closure closureB = (Closure) regulationMap.get("Closure B");
35+
final TemporalClosure closureA = (TemporalClosure) regulationMap.get("Closure A");
36+
final TemporalClosure closureB = (TemporalClosure) regulationMap.get("Closure B");
3737
final IndividualBetLimits betLimits = (IndividualBetLimits) regulationMap.get("BET limits");
3838
Stream.of(closureA, closureB, betLimits).forEach(this::deactivateForYearsActive);
39-
final Closure newClosureA = new Closure(
39+
final TemporalClosure newClosureA = new TemporalClosure(
4040
getYearsActive(),
4141
closureA.getAgentTag().getValue(),
4242
addDays(closureA.beginning(), -days),
4343
closureA.end(),
4444
closureA.getDaysToForbidDeploymentsBefore().getIntValue()
4545
);
46-
final Closure newClosureB = new Closure(
46+
final TemporalClosure newClosureB = new TemporalClosure(
4747
getYearsActive(),
4848
closureA.getAgentTag().getValue(),
4949
closureA.beginning(),

0 commit comments

Comments
 (0)