Change type signature on NumExprNumeric. Remove implicit on modeler

Author: guillaume-vantroeyen

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

@@ -6,8 +6,6 @@
 
 package com.decisionbrain.cplex
 
-import com.decisionbrain.cplex.cp.CpModel
-
 /**
   * Created by dgodard on 11/02/2017.
   */
@@ -16,7 +14,7 @@ import com.decisionbrain.cplex.cp.CpModel
   *
   * @param modeler is the optimization model
   */
-class IntExprNumeric(implicit modeler: Modeler) extends Numeric[IntExpr] {
+class IntExprNumeric(modeler: Modeler) extends Numeric[IntExpr] {
 
   override def fromInt(x: Int): IntExpr = modeler.linearIntExpr(x)
 
@@ -42,7 +40,7 @@ class IntExprNumeric(implicit modeler: Modeler) extends Numeric[IntExpr] {
 
 object IntExprNumeric {
 
-  def apply(modeler: Modeler): Numeric[IntExpr] = new IntExprNumeric()(implicitly(modeler))
+  def apply(modeler: Modeler): IntExprNumeric = new IntExprNumeric(modeler)
 
-  implicit def num(implicit modeler: Modeler): Numeric[IntExpr] = modeler.getIntExprNumeric()
+  implicit def num(implicit modeler: Modeler): IntExprNumeric = modeler.getIntExprNumeric()
 }

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

@@ -894,7 +894,7 @@ abstract class Modeler {
     * </pre>
     * @return the numeric for numeric expression
     */
-  def getNumExprNumeric(): Numeric[NumExpr] = numExprNumeric
+  def getNumExprNumeric(): NumExprNumeric = numExprNumeric
 
   /**
     * Returns the numeric for numeric expressions. This allows to do things such as calling method sum on list of
@@ -908,7 +908,7 @@ abstract class Modeler {
     * </pre>
     * @return the numeric for integer expression
     */
-  def getIntExprNumeric(): Numeric[IntExpr] = intExprNumeric
+  def getIntExprNumeric(): IntExprNumeric = intExprNumeric
 
 }
 

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

@@ -14,7 +14,7 @@ package com.decisionbrain.cplex
   *
   * @param modeler is the mathematical programming model
   */
-class NumExprNumeric(implicit modeler: Modeler) extends Numeric[NumExpr] {
+class NumExprNumeric(modeler: Modeler) extends Numeric[NumExpr] {
 
   override def fromInt(x: Int): NumExpr = modeler.linearNumExpr(x)
 
@@ -39,7 +39,7 @@ class NumExprNumeric(implicit modeler: Modeler) extends Numeric[NumExpr] {
 
 object NumExprNumeric {
 
-  def apply(modeler: Modeler): Numeric[NumExpr] = new NumExprNumeric()(implicitly(modeler))
+  def apply(modeler: Modeler): NumExprNumeric = new NumExprNumeric(modeler)
 
-  implicit def num(implicit model: Modeler): Numeric[NumExpr] = model.getNumExprNumeric()
+  implicit def num(implicit model: Modeler): NumExprNumeric = model.getNumExprNumeric()
 }

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

@@ -2226,6 +2226,14 @@ class CpModel(val name: String=null) extends Modeler {
     */
   def isFixed(expr: NumVar) : Boolean = cp.isFixed(expr.getIloNumVar())
 
+  /**
+    * Returns true if and only if interval variable a is present in the invoking instance of CpModel.
+    *
+    * @param v is an IntervalVar
+    * @return a boolean
+    */
+  def isPresent(v: IntervalVar): Boolean = cp.isPresent(v.getIloIntervalVar())
+
   /**
     * Returns the start of the interval variable.
     *
@@ -3915,7 +3923,7 @@ object CpModel {
     * @param f is the cumul function expression
     * @param a is the interval variable
     * @param v is the value of the cumul funcfion expression if the interval variable is present
-    * @return a new constraint on the cumul functoin expression
+    * @return a new constraint on the cumul function expression
     */
   def alwaysEqual(f: CumulFunctionExpr, a: IntervalVar, v: Int)(implicit model: CpModel): Constraint =
     model.alwaysEqual(f, a, v)