Merge branch 'release/1.3.0'

Author: danielgodard

README.md

@@ -18,17 +18,20 @@ To get up to speed, the easiest way to start with this library is to study the e
  * src/examples/mp: examples of optimization models based on mathematical programming
  * src/examples/cp: examples of optimization models based on constraint programming
 
-This library has been tested using IBM ILOG CPLEX 12.6.3 and 12.7.0, Scala 2.11.8 and Java JDK 1.8.0_121. If you want 
-to play with this library and do not have a license of CPLEX, you can download 
-[IBM ILOG CPLEX Optimization Studio Community Edition](https://www-01.ibm.com/software/websphere/products/optimization/cplex-studio-community-edition/)
+This library has been tested using IBM ILOG CPLEX 12.8, Scala 2.12.6 and Java JDK 1.8.0_161 on Windows 10 
+64 bits. Port to 32 bits or Linux should be fairly easy, see file `build.gradle`. Last revision compatible with 
+IBM ILOG Decision Optimization Center 3.9 is release 1.2.0 (Java 6, Scala 2.11.8)
 
-To build the library install gradle 2.10 and set the environment variable `CPLEX_STUDIO_HOME` (e.g. 
-on windows `C:\IBM\ILOG\CPLEX_Studio127`).  
+If you want to play with this library and do not have a license of CPLEX, you can download the  
+[Community Edition of IBM ILOG CPLEX Optimization Studio](https://www-01.ibm.com/software/websphere/products/optimization/cplex-studio-community-edition/)
+
+To build this library use the Gradle wrapper provided or install [Gradle 2.10](https://gradle.org) and set the environment variable `CPLEX_STUDIO_HOME` (e.g. 
+on windows `C:\IBM\ILOG\CPLEX_Studio128`).  
 
 Then do:
 
 ```
-$ gradle build
+$ ./gradlew build
 ```
 
 This will create the scala library in directory `build/libs`.
@@ -37,15 +40,29 @@ This will create the scala library in directory `build/libs`.
 To run the tests, do:
 
 ```
-$ gradle test
+$ ./gradlew test
 ```
 
 Reports are generated in directory `build/reports/tests`.
 
 To generate the scala docs, do:
 
 ```
-$ gradle scaladoc
+$ ./gradlew scaladoc
+```
+
+The scala documentation is generated in directory `build/docs/scaladoc`.
+
+To clean and rebuild the library, do:
+
+```
+$ ./gradlew clean build
 ```
 
-The scala documentation is generated in directory `build/docs/scaladoc`.
+For a complete list of Gradle tasks, do:
+
+```
+$ ./gradlew tasks
+```
+
+

RELEASENOTES.md

@@ -1,5 +1,43 @@
+# Release Notes of cplex-scala: A Scala library for IBM ILOG CPLEX
+
+## cplex-scala v1.3.0
+
+  * Functional programming: add iterators for cumul function expression, state function, step function and piecewise 
+  linear function. Furthermore, these functions are now iterables and this allow to iterate like 
+  this:
+  ```scala
+     val f = model.numToNumStepFunction()
+     ...
+     for (s <- f) {
+        println("[" + s.start + " .. " + s.end + ") -> " + s.value)
+     }
+  ```
+  * Add type `IntSet`, factory methods and iterator.
+  * Add scala API for inverse constraint and add example `Talent.scala`.
+  * Port to CPLEX 12.8
+  * Port to Scala 2.12.6
+  * Add new signature for method alternative with only two parameters
+  * Add method getFirst, getLast, getNext and getPrev in class CpModel to get rescpectively the first interval variable
+  in the sequence, the last interval variable in the sequence, the next interval variable in the sequence, the previous
+  interval variable in the sequence.
+  * IntervalSequenceVariable is now a proper class. It implements the Trait Iterable: one can write something like this:
+  ```scala
+    val seq = model.intervalSequenceVar()
+    ...
+    for (x <- seq) {
+      System.out.println(model.getDomain(x))
+    }
+  ```
+  * Add example SchedSetup: a scheduling problem on two alternative heterogeneous machines with sequence dependent setup
+  times and forbidden transisions
+  
+  
 ## cplex-scala v1.2.0
 
+### README
+
+ * Add a link to IBM ILOG CPLEX Studio Community Edition download page in the README
+
 ### Constraint Programming
 
  * Add state function
@@ -8,7 +46,6 @@
  * Add missing precedence constraints in companion object of CpModel
  * Add constraints `alwaysEqual` on cumul functions
  * Add integer division on integer expression
- * Add a link to IBM ILOG CPLEX Studio Community Edition download page in the README
 
 ## cplex-scala v1.1.0
 

build.gradle

@@ -1,5 +1,11 @@
+/*
+ * Source file provided under Apache License, Version 2.0, January 2004,
+ * http://www.apache.org/licenses/
+ * (c) Copyright DecisionBrain SAS 2016,2017
+ */
+
 group 'com.decisionbrain'
-version '1.2.0'
+version '1.3.0'
 
 apply plugin: 'java'
 apply plugin: 'scala'
@@ -61,10 +67,10 @@ configurations.all {
 sourceSets {
     main {
         java {
-            srcDirs = ['src/main/java']
+            srcDirs = ['src/main/java', 'src/examples/java']
         }
         scala {
-            srcDirs = ['src/main/scala']
+            srcDirs = ['src/main/scala', 'src/examples/scala']
         }
         resources {
             srcDir 'src/main/resources'
@@ -75,7 +81,7 @@ sourceSets {
             srcDirs = ['src/test/java']
         }
         scala {
-            srcDirs = ['src/test/scala', 'src/examples/scala']
+            srcDirs = ['src/test/scala']
         }
         resources {
             srcDir 'src/test/resources'
@@ -126,16 +132,16 @@ javadoc {
 }
 
 ext {
-    scalaVersion = '2.11.8'
-    scalaVersionShort = '2.11'
+    scalaVersion = '2.12.6'
+    scalaVersionShort = '2.12'
 }
 
 dependencies {
     compile fileTree(dir: cplexStudioHome + "/opl/lib", include: ['*.jar'])
 
     compile 'org.slf4j:slf4j-api:1.7.10'
     compile 'commons-lang:commons-lang:2.6'
-    compile('org.scala-lang:scala-library:2.11.8')
+    compile('org.scala-lang:scala-library:2.12.6')
 
     testCompile "org.hamcrest:hamcrest-core:1.3"
     testCompile "org.hamcrest:hamcrest-library:1.3"
@@ -154,7 +160,7 @@ task listJars << {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.10'
+    gradleVersion = '4.8.1'
     description = 'Install Gradle Wrapper'
 }
 

data/rehearsal.data

@@ -0,0 +1,7 @@
+5 1 1 1 1 1
+9 2 4 1 3 3 2 5 7 6
+1 1 0 1 0 1 1 0 1
+1 1 0 1 1 1 0 1 0
+1 1 0 0 0 0 1 1 0
+1 0 0 0 1 1 0 0 1
+0 0 1 0 1 1 1 1 0

gradle/wrapper/gradle-wrapper.properties

@@ -1,12 +1,6 @@
-#
-# Source file provided under Apache License, Version 2.0, January 2004,
-# http://www.apache.org/licenses/
-# (c) Copyright DecisionBrain SAS 2016,2017
-#
-
-#Sat Feb 04 16:30:34 CET 2017
+#Tue Jun 26 19:12:53 CEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-all.zip

src/examples/scala/com/decisionbrain/cplex/cp/Color.scala

@@ -1,7 +1,7 @@
 /*
  * Source file provided under Apache License, Version 2.0, January 2004,
  * http://www.apache.org/licenses/
- * (c) Copyright DecisionBrain SAS 2016,2017
+ * (c) Copyright DecisionBrain SAS 2016,2018
  */
 
 package com.decisionbrain.cplex.cp
@@ -50,9 +50,8 @@ object Color {
 
     if (status) {
       println(s"Solution status: $status")
-      for (country <- countries.toList) {
+      for (country <- countries) {
         println("\t" + country + ": " + allColors(model.getValue(colors(country))))
-//        println(c)
       }
     }
 

src/examples/scala/com/decisionbrain/cplex/cp/Facility.scala

@@ -1,7 +1,7 @@
 /*
  * Source file provided under Apache License, Version 2.0, January 2004,
  * http://www.apache.org/licenses/
- * (c) Copyright DecisionBrain SAS 2016,2017
+ * (c) Copyright DecisionBrain SAS 2016,2018
  */
 
 package com.decisionbrain.cplex.cp

src/examples/scala/com/decisionbrain/cplex/cp/Golomb.scala

@@ -1,7 +1,7 @@
 /*
  * Source file provided under Apache License, Version 2.0, January 2004,
  * http://www.apache.org/licenses/
- * (c) Copyright DecisionBrain SAS 2016,2017
+ * (c) Copyright DecisionBrain SAS 2016,2018
  */
 
 package com.decisionbrain.cplex.cp

src/examples/scala/com/decisionbrain/cplex/cp/HouseBuilding.scala

@@ -1,13 +1,11 @@
 /*
  * Source file provided under Apache License, Version 2.0, January 2004,
  * http://www.apache.org/licenses/
- * (c) Copyright DecisionBrain SAS 2016,2017
+ * (c) Copyright DecisionBrain SAS 2016,2018
  */
 
 package com.decisionbrain.cplex.cp
 
-import ilog.concert.IloIntervalVar
-
 import com.decisionbrain.cplex.cp.CpModel._
 
 

src/examples/scala/com/decisionbrain/cplex/cp/SchedCalendar.scala

@@ -1,7 +1,7 @@
 /*
  * Source file provided under Apache License, Version 2.0, January 2004,
  * http://www.apache.org/licenses/
- * (c) Copyright DecisionBrain SAS 2016,2017
+ * (c) Copyright DecisionBrain SAS 2016,2018
  */
 
 package com.decisionbrain.cplex.cp