Skip to content

Commit 560550f

Browse files
MathisSinetMathisSinet
committed
Removed some code duplication in MF.ts
1 parent a8be423 commit 560550f

1 file changed

Lines changed: 27 additions & 27 deletions

File tree

‎src/Theories/CTs/MF.ts‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -176,99 +176,99 @@ class mfSim extends theoryClass<theory> {
176176

177177
// MFVariantd1d1d2Coast
178178
const activeStrat112: conditionFunction[] = [
179-
() => ((this.variables[0].level < this.lastC1) && (this.variables[0].cost +l10(9.9) <= Math.min(this.variables[1].cost, this.variables[3].cost, this.variables[4].cost))),
179+
activeStrat[0],
180180
() => true,
181-
() => (this.i/(i0*10 ** this.variables[3].value) < 0.5 || this.variables[2].cost+1<this.maxRho),
181+
activeStrat[2],
182182
() => true,
183-
() => this.variables[4].cost + l10(dPower[this.milestones[2]]) < Math.min(this.variables[1].cost + l10(2), this.variables[3].cost),
183+
activeStrat2[4],
184184
...new Array(4).fill(() => true)
185185
];
186186
// MFVariantd1d1d2Coast END
187187

188188
// MFVariantd1d1d3Coast
189189
const activeStrat113: conditionFunction[] = [
190-
() => ((this.variables[0].level < this.lastC1) && (this.variables[0].cost +l10(9.9) <= Math.min(this.variables[1].cost, this.variables[3].cost, this.variables[4].cost))),
190+
activeStrat[0],
191191
() => true,
192-
() => (this.i/(i0*10 ** this.variables[3].value) < 0.5 || this.variables[2].cost+1<this.maxRho),
192+
activeStrat[2],
193193
() => true,
194-
() => this.variables[4].cost < Math.min(this.variables[3].cost + l10(0.6), this.variables[1].cost + l10(0.75)),
194+
activeStrat3[4],
195195
...new Array(4).fill(() => true)
196196
];
197197
// MFVariantd1d1d3Coast END
198198

199199
// MFVariantd1d2d1Coast
200200
const activeStrat121: conditionFunction[] = [
201-
() => ((this.variables[0].level < this.lastC1) && (this.variables[0].cost +l10(9.9) <= Math.min(this.variables[1].cost, this.variables[3].cost, this.variables[4].cost))),
201+
activeStrat[0],
202202
() => true,
203-
() => (l10(this.i) + l10(1.2) < this.variables[3].value - 15 || (this.variables[2].cost + l10(20) < this.maxRho && l10(this.i) + l10(1.012) < this.variables[3].value - 15)),
203+
activeStrat2[2],
204204
() => true,
205-
() => this.variables[4].cost < Math.min(this.variables[1].cost, this.variables[3].cost),
205+
activeStrat[4],
206206
...new Array(4).fill(() => true)
207207
];
208208
// MFVariantd1d2d1Coast END
209209

210210
// MFVariantd1d2d2Coast
211211
const activeStrat122: conditionFunction[] = [
212-
() => ((this.variables[0].level < this.lastC1) && (this.variables[0].cost +l10(9.9) <= Math.min(this.variables[1].cost, this.variables[3].cost, this.variables[4].cost))),
212+
activeStrat[0],
213213
() => true,
214-
() => (l10(this.i) + l10(1.2) < this.variables[3].value - 15 || (this.variables[2].cost + l10(20) < this.maxRho && l10(this.i) + l10(1.012) < this.variables[3].value - 15)),
214+
activeStrat2[2],
215215
() => true,
216-
() => this.variables[4].cost + l10(dPower[this.milestones[2]]) < Math.min(this.variables[1].cost + l10(2), this.variables[3].cost),
216+
activeStrat2[4],
217217
...new Array(4).fill(() => true)
218218
];
219219
// MFVariantd1d2d2Coast END
220220

221221
// MFVariantd2d1d1Coast
222222
const activeStrat211: conditionFunction[] = [
223-
() => ((this.variables[0].level < this.lastC1) && (this.variables[0].cost + l10(8 + (this.variables[0].level % 7)) <= Math.min(this.variables[1].cost + l10(2), this.variables[3].cost, this.milestones[1] > 0 ? (this.variables[4].cost + l10(dPower[this.milestones[2]])) : Infinity))),
223+
activeStrat2[0],
224224
() => true,
225-
() => (this.i/(i0*10 ** this.variables[3].value) < 0.5 || this.variables[2].cost+1<this.maxRho),
225+
activeStrat[2],
226226
() => true,
227-
() => this.variables[4].cost < Math.min(this.variables[1].cost, this.variables[3].cost),
227+
activeStrat[4],
228228
...new Array(4).fill(() => true)
229229
];
230230
// MFVariantd2d1d1Coast END
231231

232232
// MFVariantd2d1d2Coast
233233
const activeStrat212: conditionFunction[] = [
234-
() => ((this.variables[0].level < this.lastC1) && (this.variables[0].cost + l10(8 + (this.variables[0].level % 7)) <= Math.min(this.variables[1].cost + l10(2), this.variables[3].cost, this.milestones[1] > 0 ? (this.variables[4].cost + l10(dPower[this.milestones[2]])) : Infinity))),
234+
activeStrat2[0],
235235
() => true,
236-
() => (this.i/(i0*10 ** this.variables[3].value) < 0.5 || this.variables[2].cost+1<this.maxRho),
236+
activeStrat[2],
237237
() => true,
238-
() => this.variables[4].cost + l10(dPower[this.milestones[2]]) < Math.min(this.variables[1].cost + l10(2), this.variables[3].cost),
238+
activeStrat2[4],
239239
...new Array(4).fill(() => true)
240240
];
241241
// MFVariantd2d1d2Coast END
242242

243243
// MFVariantd2d1d3Coast
244244
const activeStrat213: conditionFunction[] = [
245-
() => ((this.variables[0].level < this.lastC1) && (this.variables[0].cost + l10(8 + (this.variables[0].level % 7)) <= Math.min(this.variables[1].cost + l10(2), this.variables[3].cost, this.milestones[1] > 0 ? (this.variables[4].cost + l10(dPower[this.milestones[2]])) : Infinity))),
245+
activeStrat2[0],
246246
() => true,
247-
() => (this.i/(i0*10 ** this.variables[3].value) < 0.5 || this.variables[2].cost+1<this.maxRho),
247+
activeStrat[2],
248248
() => true,
249-
() => this.variables[4].cost < Math.min(this.variables[3].cost + l10(0.6), this.variables[1].cost + l10(0.75)),
249+
activeStrat3[4],
250250
...new Array(4).fill(() => true)
251251
];
252252
// MFVariantd2d1d3Coast END
253253

254254
// MFVariantd2d2d1Coast
255255
const activeStrat221: conditionFunction[] = [
256-
() => ((this.variables[0].level < this.lastC1) && (this.variables[0].cost + l10(8 + (this.variables[0].level % 7)) <= Math.min(this.variables[1].cost + l10(2), this.variables[3].cost, this.milestones[1] > 0 ? (this.variables[4].cost + l10(dPower[this.milestones[2]])) : Infinity))),
256+
activeStrat2[0],
257257
() => true,
258-
() => (l10(this.i) + l10(1.2) < this.variables[3].value - 15 || (this.variables[2].cost + l10(20) < this.maxRho && l10(this.i) + l10(1.012) < this.variables[3].value - 15)),
258+
activeStrat2[2],
259259
() => true,
260-
() => this.variables[4].cost < Math.min(this.variables[1].cost, this.variables[3].cost),
260+
activeStrat[4],
261261
...new Array(4).fill(() => true)
262262
];
263263
// MFVariantd2d2d1Coast END
264264

265265
// MFVariantd2d2d3RCCoast
266266
const activeStrat223: conditionFunction[] = [
267-
() => ((this.variables[0].level < this.lastC1) && (this.variables[0].cost + l10(8 + (this.variables[0].level % 7)) <= Math.min(this.variables[1].cost + l10(2), this.variables[3].cost, this.milestones[1] > 0 ? (this.variables[4].cost + l10(dPower[this.milestones[2]])) : Infinity))),
267+
activeStrat2[0],
268268
() => true,
269-
() => (l10(this.i) + l10(1.2) < this.variables[3].value - 15 || (this.variables[2].cost + l10(20) < this.maxRho && l10(this.i) + l10(1.012) < this.variables[3].value - 15)),
269+
activeStrat2[2],
270270
() => true,
271-
() => this.variables[4].cost < Math.min(this.variables[3].cost + l10(0.6), this.variables[1].cost + l10(0.75)),
271+
activeStrat3[4],
272272
...new Array(4).fill(() => true)
273273
];
274274
// MFVariantd2d2d3Coast END

0 commit comments

Comments
 (0)