Skip to content

Commit a60c6f4

Browse files
committed
Add API for CPLEX annotations. Add an example of Benders decomposition using the CPLEX annotations.
1 parent 5cbcae7 commit a60c6f4

File tree

22 files changed

+5747
-30
lines changed

22 files changed

+5747
-30
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ Thumbs.db
4343
######################
4444
*.cpo
4545
*.lp
46+
*.ann
4647

4748
# Other files #
4849
######################

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ To get up to speed, the easiest way to start with this library is to study the e
1818
* src/examples/mp: examples of optimization models based on mathematical programming
1919
* src/examples/cp: examples of optimization models based on constraint programming
2020

21-
This library has been tested using IBM ILOG CPLEX 12.9, Scala 2.12.8 and Java JDK 1.8.0_202 on Windows 10
21+
This library has been tested using IBM ILOG CPLEX 12.10, Scala 2.12.10 and Java JDK 8 on Windows 10
2222
64 bits. Port to 32 bits or Linux should be fairly easy, see file `build.gradle`. Last revision compatible with
2323
IBM ILOG Decision Optimization Center 3.9 is release 1.2.0 (Java 6, Scala 2.11.8)
2424

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ scaladoc {
142142
}
143143

144144
ext {
145-
scalaVersion = '2.12.8'
145+
scalaVersion = '2.12.10'
146146
scalaVersionShort = '2.12'
147147
}
148148

@@ -152,13 +152,13 @@ dependencies {
152152

153153
compile 'org.slf4j:slf4j-api:1.7.10'
154154
compile 'commons-lang:commons-lang:2.6'
155-
compile('org.scala-lang:scala-library:2.12.8')
155+
compile('org.scala-lang:scala-library:2.12.10')
156156

157157
testCompile "org.hamcrest:hamcrest-core:1.3"
158158
testCompile "org.hamcrest:hamcrest-library:1.3"
159159
testCompile('org.mockito:mockito-all:1.9.5')
160160
testCompile("junit:junit:4.12")
161-
testCompile("org.scalatest:scalatest_$scalaVersionShort:3.0.1")
161+
testCompile("org.scalatest:scalatest_$scalaVersionShort:3.0.8")
162162
testCompile 'org.slf4j:slf4j-simple:1.7.10'
163163
}
164164

0 commit comments

Comments
 (0)