Skip to content

Commit 87c4e03

Browse files
fuookamifuookami
committed
chore: update version.
1 parent de05ec4 commit 87c4e03

File tree

13 files changed

+25
-25
lines changed

13 files changed

+25
-25
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ each ospf implementation consists of the following components:
368368
<thead>
369369
<tr>
370370
<th>Feature</th>
371-
<td></th>
371+
<th></th>
372372
</tr>
373373
</thead>
374374
<tbody>

‎examples/ospf-kotlin-example/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>io.github.fuookami.ospf.kotlin</groupId>
77
<artifactId>ospf-kotlin-parent</artifactId>
8-
<version>1.0.17</version>
8+
<version>1.0.21</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎examples/ospf-kotlin-example/src/main/fuookami/ospf/kotlin/example/column_generation_demo/demo1/SP.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ object InitialSolutionGenerator {
2525
}
2626

2727
class SP {
28-
private val solver: ColumnGenerationSolver = SCIPColumnGenerationSolver()
28+
private val solver: ColumnGenerationSolver = ScipColumnGenerationSolver()
2929

3030
suspend operator fun invoke(
3131
iteration: UInt64,

‎examples/ospf-kotlin-example/src/main/fuookami/ospf/kotlin/example/core_demo/Demo1.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ data object Demo1 {
9191
}
9292

9393
private suspend fun solve(): Try {
94-
val solver = SCIPLinearSolver()
94+
val solver = ScipLinearSolver()
9595
when (val ret = solver(metaModel)) {
9696
is Ok -> {
9797
metaModel.tokens.setSolution(ret.value.solution)

‎examples/ospf-kotlin-example/src/main/fuookami/ospf/kotlin/example/core_demo/Demo2.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ data object Demo2 {
138138
}
139139

140140
private suspend fun solve(): Try {
141-
val solver = SCIPLinearSolver()
141+
val solver = ScipLinearSolver()
142142
when (val ret = solver(metaModel)) {
143143
is Ok -> {
144144
metaModel.tokens.setSolution(ret.value.solution)

‎examples/ospf-kotlin-example/src/main/fuookami/ospf/kotlin/example/core_demo/Demo3.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ data object Demo3 {
123123
}
124124

125125
private suspend fun solve(): Try {
126-
val solver = SCIPLinearSolver()
126+
val solver = ScipLinearSolver()
127127
when (val ret = solver(metaModel)) {
128128
is Ok -> {
129129
metaModel.tokens.setSolution(ret.value.solution)

‎examples/ospf-kotlin-example/src/main/fuookami/ospf/kotlin/example/core_demo/Demo4.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ data object Demo4 {
123123
}
124124

125125
private suspend fun solve(): Try {
126-
val solver = SCIPLinearSolver()
126+
val solver = ScipLinearSolver()
127127
when (val ret = solver(metaModel)) {
128128
is Ok -> {
129129
metaModel.tokens.setSolution(ret.value.solution)

‎examples/ospf-kotlin-example/src/main/fuookami/ospf/kotlin/example/core_demo/Demo5.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ data object Demo5 {
8686
}
8787

8888
private suspend fun solve(): Try {
89-
val solver = SCIPLinearSolver()
89+
val solver = ScipLinearSolver()
9090
when (val ret = solver(metaModel)) {
9191
is Ok -> {
9292
metaModel.tokens.setSolution(ret.value.solution)

‎examples/ospf-kotlin-example/src/main/fuookami/ospf/kotlin/example/core_demo/Demo6.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ data object Demo6 {
9191
}
9292

9393
private suspend fun solve(): Try {
94-
val solver = SCIPLinearSolver()
94+
val solver = ScipLinearSolver()
9595
when (val ret = solver(metaModel)) {
9696
is Ok -> {
9797
metaModel.tokens.setSolution(ret.value.solution)

‎examples/ospf-kotlin-example/src/main/fuookami/ospf/kotlin/example/core_demo/Demo7.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ data object Demo7 {
152152
}
153153

154154
private suspend fun solve(): Try {
155-
val solver = SCIPLinearSolver()
155+
val solver = ScipLinearSolver()
156156
when (val ret = solver(metaModel)) {
157157
is Ok -> {
158158
metaModel.tokens.setSolution(ret.value.solution)

‎examples/ospf-kotlin-example/src/main/fuookami/ospf/kotlin/example/framework_demo/demo1/Application.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ class SSP {
107107
}
108108

109109
private suspend fun solve(metaModel: LinearMetaModel): Ret<List<Flt64>> {
110-
val solver = SCIPLinearSolver()
110+
val solver = ScipLinearSolver()
111111
return when (val ret = solver(metaModel)) {
112112
is Ok -> {
113113
metaModel.tokens.setSolution(ret.value.solution)

‎examples/ospf-kotlin-example/src/test/fuookami/ospf/kotlin/example/LinearPiecewiseTest.kt

+9-9
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class LinearPiecewiseTest {
2020
x.range.leq(Flt64.two)
2121
x.range.geq(-Flt64.two)
2222
val abs = AbsFunction(LinearPolynomial(x), name = "abs")
23-
val solver = SCIPLinearSolver()
23+
val solver = ScipLinearSolver()
2424

2525
val model1 = LinearMetaModel()
2626
model1.add(x)
@@ -108,7 +108,7 @@ class LinearPiecewiseTest {
108108
val y = UIntVar("y")
109109
y.range.leq(UInt64.two)
110110
val and = AndFunction(listOf(LinearPolynomial(x), LinearPolynomial(y)), "and")
111-
val solver = SCIPLinearSolver()
111+
val solver = ScipLinearSolver()
112112

113113
val model1 = LinearMetaModel()
114114
model1.add(x)
@@ -134,7 +134,7 @@ class LinearPiecewiseTest {
134134
val x = URealVar("x")
135135
x.range.leq(Flt64.two)
136136
val bin = BinaryzationFunction(LinearPolynomial(x), name = "bin")
137-
val solver = SCIPLinearSolver()
137+
val solver = ScipLinearSolver()
138138

139139
val model1 = LinearMetaModel()
140140
model1.add(x)
@@ -172,7 +172,7 @@ class LinearPiecewiseTest {
172172
val x = UIntVar("x")
173173
x.range.leq(UInt64.two)
174174
val bin = BinaryzationFunction(LinearPolynomial(x), name = "bin")
175-
val solver = SCIPLinearSolver()
175+
val solver = ScipLinearSolver()
176176

177177
val model1 = LinearMetaModel()
178178
model1.add(x)
@@ -211,7 +211,7 @@ class LinearPiecewiseTest {
211211
x.range.leq(Flt64.two)
212212
x.range.geq(-Flt64.two)
213213
val bter = BalanceTernaryzationFunction(LinearPolynomial(x), name = "bter")
214-
val solver = SCIPLinearSolver()
214+
val solver = ScipLinearSolver()
215215

216216
val model1 = LinearMetaModel()
217217
model1.add(x)
@@ -282,7 +282,7 @@ class LinearPiecewiseTest {
282282
x.range.leq(Int64.two)
283283
x.range.geq(-Int64.two)
284284
val bter = BalanceTernaryzationFunction(LinearPolynomial(x), name = "bter")
285-
val solver = SCIPLinearSolver()
285+
val solver = ScipLinearSolver()
286286

287287
val model1 = LinearMetaModel()
288288
model1.add(x)
@@ -348,7 +348,7 @@ class LinearPiecewiseTest {
348348

349349
model.minimize(semi)
350350

351-
val solver = SCIPLinearSolver()
351+
val solver = ScipLinearSolver()
352352
val result = runBlocking { solver(model) }
353353
assert(result.value!!.obj eq Flt64.zero)
354354
}
@@ -374,7 +374,7 @@ class LinearPiecewiseTest {
374374

375375
model.maximize(LinearPolynomial(ulp))
376376

377-
val solver = SCIPLinearSolver()
377+
val solver = ScipLinearSolver()
378378
val result = runBlocking { solver(model) }
379379
assert(result.value!!.solution[0] eq Flt64.one)
380380
}
@@ -406,7 +406,7 @@ class LinearPiecewiseTest {
406406

407407
model.maximize(LinearPolynomial(blp))
408408

409-
val solver = SCIPLinearSolver()
409+
val solver = ScipLinearSolver()
410410
val result = runBlocking { solver(model) }
411411
assert(result.value!!.solution[0] eq Flt64.one)
412412
assert(result.value!!.solution[1] eq Flt64.one)

‎examples/ospf-kotlin-example/src/test/fuookami/ospf/kotlin/example/QuadraticTest.kt

+5-5
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class QuadraticTest {
2626
model.add(x)
2727
model.maximize((Flt64.one - x) * (Flt64.one - x))
2828

29-
val solver1 = SCIPQuadraticSolver()
29+
val solver1 = ScipQuadraticSolver()
3030
val result1 = runBlocking { solver1(model) }
3131
assert(result1.value!!.solution[0] eq -Flt64.two)
3232

@@ -50,7 +50,7 @@ class QuadraticTest {
5050
model.maximize(x)
5151
model.addConstraint(x * x leq Flt64(4.0))
5252

53-
val solver1 = SCIPQuadraticSolver()
53+
val solver1 = ScipQuadraticSolver()
5454
val result1 = runBlocking { solver1(model) }
5555
assert(result1.value!!.solution[0] eq Flt64.two)
5656

@@ -74,7 +74,7 @@ class QuadraticTest {
7474
model.minimize(x * x)
7575
model.addConstraint(x * x leq Flt64(4.0))
7676

77-
val solver1 = SCIPQuadraticSolver()
77+
val solver1 = ScipQuadraticSolver()
7878
val result1 = runBlocking { solver1(model) }
7979
assert(result1.value!!.solution[0] eq Flt64.zero)
8080

@@ -98,7 +98,7 @@ class QuadraticTest {
9898
model.maximize(x * x + x)
9999
model.addConstraint(x * x leq Flt64(4.0))
100100

101-
val solver1 = SCIPQuadraticSolver()
101+
val solver1 = ScipQuadraticSolver()
102102
val result1 = runBlocking { solver1(model) }
103103
assert(result1.value!!.solution[0] eq Flt64.two)
104104

@@ -134,7 +134,7 @@ class QuadraticTest {
134134

135135
model.maximize(sum(x[_a, _a]))
136136

137-
val solver = SCIPLinearSolver()
137+
val solver = ScipLinearSolver()
138138
val result = runBlocking {
139139
solver(model)
140140
}

0 commit comments

Comments
 (0)