Move method 'add' from CpMode and MpModel to Modeler. Add method 'add' with a set of addable objects as parameter.

Author: danielgodard

RELEASENOTES.md

@@ -4,6 +4,7 @@
 
   * Add API for KPIs in CpModel: see example PlantLocation.scala
   * Add methods quot in class CpModel for division and define operators '/' in class NumExpr 
+  * Move methods `add` from CpModel and MpModel to Modeler
 
 ## cplex-scala v1.5.2
 

build.gradle

@@ -33,7 +33,7 @@ println("Maven user: $MAVEN_USER")
 
 task sourcesJar(type: Jar) {
     archiveClassifier = 'sources'
-    from sourceSets.main.allJava
+    from sourceSets.main.allSource
 }
 
 task javadocJar(type: Jar) {

src/main/scala/com/decisionbrain/cplex/Modeler.scala

@@ -8,6 +8,7 @@ package com.decisionbrain.cplex
 
 import com.decisionbrain.cplex.Modeler._
 import com.decisionbrain.cplex.cp.CpModel
+import com.decisionbrain.cplex.mp.MpModel
 import ilog.concert.{IloIntExpr, IloIntVar, IloModeler, IloNumExpr, IloNumVar}
 
 import scala.reflect.ClassTag
@@ -834,6 +835,29 @@ abstract class Modeler {
   def ifThen(ct1: Constraint, ct2: Constraint): Constraint =
     Constraint(modeler.ifThen(ct1.getIloConstraint(), ct2.getIloConstraint()))(implicitly(this))
 
+  /**
+    * Add an addable object in the model.
+    *
+    * @param a is the object to add to the model
+    * @return the model
+    */
+  def add(a: Addable, name: String=null): Modeler = {
+    a.setName(name)
+    modeler.add(a.getIloAddable())
+    this
+  }
+
+  /**
+    * Add addable objects in the model.
+    *
+    * @param addables are the object to add to the model
+    * @return the model
+    */
+  def add(addables: Iterable[Addable]): Modeler = {
+    modeler.add(addables.map(a => a.getIloAddable()).toArray)
+    this
+  }
+
   /**
     * Creates and returns an objective object to minimize the expression <em>expr</em>.
     *

src/main/scala/com/decisionbrain/cplex/cp/CpModel.scala

@@ -2024,19 +2024,6 @@ case class CpModel(name: String=null) extends Modeler {
     */
   def intSet(values: Array[Int]): IntSet = IntSet(cp.intSet(values))(implicitly(this))
 
-
-  /**
-    * Add an addable object in the model.
-    *
-    * @param a is the object to add to the model
-    * @return the model
-    */
-  def add(a: Addable, name: String=null): CpModel = {
-    a.setName(name)
-    cp.add(a.getIloAddable())
-    this
-  }
-
   /**
     * Creates a minimization multi-criteria objective.
     *

src/main/scala/com/decisionbrain/cplex/mp/MpModel.scala

@@ -163,17 +163,6 @@ case class MpModel(name: String=null) extends Modeler {
     */
   def addRange(lb: Double, expr: NumExpr, ub: Double, name: String=""): MpModel = {
     add(range(lb, expr, ub, name))
-  }
-
-  /**
-    * Add an addable object in the model.
-    *
-    * @param a is the object to add to the model
-    * @return the model
-    */
-  def add(a: Addable, name: String=null): MpModel = {
-    a.setName(name)
-    cplex.add(a.getIloAddable())
     this
   }