Added More Check() values to the ToSymbolic() methods and Tested More Of The OptimizationProblem object

Author: kwesiRutledge

Diff for: optim/scalar_linear_expr.go

@@ -431,6 +431,12 @@ Description:
 	symbolic math toolbox).
 */
 func (sle ScalarLinearExpr) ToSymbolic() (symbolic.Expression, error) {
+	// Check for errors
+	err := sle.Check()
+	if err != nil {
+		return nil, err
+	}
+
 	// Compute product of L and X
 	symX, err := sle.X.ToSymbolic()
 	if err != nil {

Diff for: optim/scalar_quadratic_expression.go

@@ -480,8 +480,11 @@ Description:
 	(i.e., one that uses the symbolic math toolbox).
 */
 func (qe ScalarQuadraticExpression) ToSymbolic() (symbolic.Expression, error) {
-	// Constants
-	var err error
+	// Input Checking
+	err := qe.Check()
+	if err != nil {
+		return nil, err
+	}
 
 	// Convert Q, L and C to symbolic
 	symQ := symbolic.DenseToKMatrix(qe.Q)

Diff for: optim/var_vector.go

@@ -442,7 +442,11 @@ Description:
 	(i.e., one that uses the symbolic math toolbox).
 */
 func (vv VarVector) ToSymbolic() (symbolic.Expression, error) {
-	// Constants
+	// Input Checking
+	err := vv.Check()
+	if err != nil {
+		return nil, err
+	}
 
 	// Algorithm
 	// Create the symbolic vector

Diff for: optim/var_vector_transpose.go

@@ -469,6 +469,28 @@ func (vvt VarVectorTranspose) Dims() []int {
 	return []int{1, vvt.Len()}
 }
 
+/*
+Check
+Description:
+
+	Checks whether or not the VarVector has a sensible initialization.
+*/
+func (vvt VarVectorTranspose) Check() error {
+	// Check that each variable is properly defined
+	for ii, element := range vvt.Elements {
+		err := element.Check()
+		if err != nil {
+			return fmt.Errorf(
+				"element %v has an issue: %v",
+				ii, err,
+			)
+		}
+	}
+
+	// If nothing was thrown, then return nil!
+	return nil
+}
+
 /*
 ToSymbolic
 Description:
@@ -477,6 +499,12 @@ Description:
 	(i.e., an expression made using SymbolicMath.go).
 */
 func (vvt VarVectorTranspose) ToSymbolic() (symbolic.Expression, error) {
+	// Input Processing
+	err := vvt.Check()
+	if err != nil {
+		return nil, err
+	}
+
 	// Constants
 	vm := symbolic.VariableMatrix{}
 

Diff for: optim/vars.go

@@ -421,7 +421,11 @@ Description:
 	(from the symbolic math toolbox).
 */
 func (v Variable) ToSymbolic() (symbolic.Expression, error) {
-	// Constants
+	// Input Checking
+	err := v.Check()
+	if err != nil {
+		return nil, err
+	}
 
 	// Create base variable and fill its elements
 	symVar := symbolic.Variable{

Diff for: problem/objective_sense.go

@@ -10,6 +10,7 @@ type ObjSense int
 const (
 	SenseMinimize ObjSense = 1
 	SenseMaximize          = -1
+	SenseFind     ObjSense = 0
 )
 
 /*

Diff for: problem/optimization_problem.go

@@ -14,7 +14,7 @@ type OptimizationProblem struct {
 	Name        string
 	Variables   []symbolic.Variable
 	Constraints []symbolic.Constraint
-	Objective   symbolic.Expression
+	Objective   Objective
 }
 
 // NewProblem returns a new model with some default arguments such as not to show
@@ -139,21 +139,6 @@ func (op *OptimizationProblem) AddBinaryVariableMatrix(rows, cols int) [][]symbo
 	return op.AddVariableMatrix(rows, cols, 0, 1, symbolic.Binary)
 }
 
-// AddConstr adds the given constraint to the model.
-func (op *OptimizationProblem) AddConstraint(constr symbolic.Constraint) error {
-	// Constants
-
-	// Input Processing
-	//err := constr.Check()
-	//if err != nil {
-	//	return err
-	//}
-
-	// Algorithm
-	op.Constraints = append(op.Constraints, constr)
-	return nil
-}
-
 /*
 SetObjective
 Description:
@@ -172,7 +157,7 @@ func (op *OptimizationProblem) SetObjective(e symbolic.Expression, sense ObjSens
 	}
 
 	// Return
-	op.Objective = NewObjective(se, sense)
+	op.Objective = *NewObjective(se, sense)
 	return nil
 }
 
@@ -272,7 +257,15 @@ func From(inputModel optim.Model) (*OptimizationProblem, error) {
 	}
 
 	// Convert Objective
-	newOptimProblem.Objective, err = inputModel.Obj.ToSymbolic()
+	objectiveExpr, err := inputModel.Obj.ToSymbolic()
+	if err != nil {
+		return nil, err
+	}
+
+	err = newOptimProblem.SetObjective(
+		objectiveExpr,
+		ObjSense(inputModel.Obj.Sense),
+	)
 	if err != nil {
 		return nil, err
 	}