Improve code coverage

Author: neil-lindquist

Diff for: src/expressions.lisp

@@ -24,11 +24,6 @@
 (declaim (inline sum-linear-expressions))
 (defun sum-linear-expressions (&rest exprs)
   "Takes linear expressions and reduces it into a single expression."
-  (sum-linear-expressions-list exprs))
-
-(declaim (inline sum-linear-expressions-list))
-(defun sum-linear-expressions-list (exprs)
-  "Takes a list of linear expressions and reduces it into a single expression."
   (let ((sum (copy-alist (first exprs))))
     (iter (for expr in (rest exprs))
       (iter (for term in expr)

Diff for: t/expressions.lisp

@@ -15,6 +15,20 @@
   :description "The suite to test linear-programming/expressions")
 (in-suite expressions)
 
+(test linear-constant-p
+  (declare (notinline linear-programming/expressions::linear-constant-p))
+  (is-true (linear-programming/expressions::linear-constant-p
+            (parse-linear-expression 5)))
+  (is-true (linear-programming/expressions::linear-constant-p
+            (parse-linear-expression 2/3)))
+  (is-true (linear-programming/expressions::linear-constant-p
+            (parse-linear-expression -1.0)))
+
+  (is-false (linear-programming/expressions::linear-constant-p
+             (parse-linear-expression 'x)))
+  (is-false (linear-programming/expressions::linear-constant-p
+             (parse-linear-expression '(+ x 5)))))
+
 (test scale-linear-expression
   (declare (notinline scale-linear-expression))
   (is (equal '((a . 24) (b . 7/2) (c . 4.5))

Diff for: t/external-formats.lisp

@@ -245,26 +245,50 @@
       (is (set-equal '((z . (0 . 4)) (|w| . (0 . 1)) (x . (nil . nil)))
                      (problem-var-bounds problem)))
       (is (simple-linear-constraint-set-equal '((<= ((x . 3) (y . 1)) 8) (<= ((y . 1) (z . 2)) 10) (<= ((|w| . -1) (x . -2) (z . 1)) 1))
-                     (problem-constraints problem))
+                     (problem-constraints problem)))))
 
-       (with-open-file (stream (merge-pathnames "t/data/simple-problem-crlf.mps"
-                                                (asdf:system-source-directory :linear-programming-test))
-                               :direction :input
-                               :external-format :utf-8)
-         (let ((problem (read-mps stream 'max)))
-           (is (typep problem 'problem))
-           (is (eq 'max (problem-type problem)))
-           (is-true (null (symbol-package (problem-objective-var problem))))
-           (is (set-equal '(x y z)
-                          (map 'list #'identity (problem-vars problem))))
-           (is (set-equal '((x . 1) (y . 4) (z . 8))
-                          (problem-objective-func problem)))
-           (is (set-equal '()
-                          (problem-integer-vars problem)))
-           (is (set-equal '()
-                          (problem-var-bounds problem)))
-           (is (simple-linear-constraint-set-equal '((<= ((x . 3) (y . 1)) 8) (<= ((y . 1) (z . 2)) 7))
-                                               (problem-constraints problem)))))))))
+  ; Test input modes
+  (with-open-file (stream (merge-pathnames "t/data/advanced-problem.mps"
+                                           (asdf:system-source-directory :linear-programming-test))
+                          :direction :input
+                          :external-format :utf-8)
+    (let ((problem (read-mps stream nil :read-case :upcase :rhs-id "rhs1")))
+      (is (set-equal '(|W| |X| |Y| |Z|)
+                     (map 'list #'identity (problem-vars problem))))))
+  (with-open-file (stream (merge-pathnames "t/data/advanced-problem.mps"
+                                           (asdf:system-source-directory :linear-programming-test))
+                          :direction :input
+                          :external-format :utf-8)
+    (let ((problem (read-mps stream nil :read-case :downcase :rhs-id "rhs1")))
+      (is (set-equal '(|w| |x| |y| |z|)
+                     (map 'list #'identity (problem-vars problem))))))
+  (with-open-file (stream (merge-pathnames "t/data/advanced-problem.mps"
+                                           (asdf:system-source-directory :linear-programming-test))
+                          :direction :input
+                          :external-format :utf-8)
+    (let ((problem (read-mps stream nil :read-case :invert :rhs-id "rhs1")))
+      (is (set-equal '(|W| |x| |y| |z|)
+                     (map 'list #'identity (problem-vars problem))))))
+
+  ; Test windows line endings
+  (with-open-file (stream (merge-pathnames "t/data/simple-problem-crlf.mps"
+                                           (asdf:system-source-directory :linear-programming-test))
+                          :direction :input
+                          :external-format :utf-8)
+    (let ((problem (read-mps stream 'max)))
+      (is (typep problem 'problem))
+      (is (eq 'max (problem-type problem)))
+      (is-true (null (symbol-package (problem-objective-var problem))))
+      (is (set-equal '(x y z)
+                     (map 'list #'identity (problem-vars problem))))
+      (is (set-equal '((x . 1) (y . 4) (z . 8))
+                     (problem-objective-func problem)))
+      (is (set-equal '()
+                     (problem-integer-vars problem)))
+      (is (set-equal '()
+                     (problem-var-bounds problem)))
+      (is (simple-linear-constraint-set-equal '((<= ((x . 3) (y . 1)) 8) (<= ((y . 1) (z . 2)) 7))
+                                          (problem-constraints problem))))))
 
 (test write-standard-format
   (let* ((problem (make-linear-problem (max (+ x y)) (<= (+ (* 2 x) y) 5)))