countrailparts consumes list in order, math tests

xplan001 · Aug 30, 2016 · 0d0370b · 0d0370b
1 parent b24ea9b
commit 0d0370b
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 7 deletions.
diff --git a/COUNT_RAIL.lsp b/COUNT_RAIL.lsp
@@ -17,7 +17,7 @@
 ;;  08/30/2016                                  ;;
 ;;  - Finished CountRailParts. And 2nd version. ;;
 ;;  - Added ListRemove & ListSearch (temp.).    ;;
-;;  - Moved them to functions.                  ;;
+;;  - Then moved them to FUNCTIONS.             ;;
 ;;  - Added unit tests.                         ;;
 ;;                                              ;;
 ;;  08/29/2016                                  ;;

diff --git a/FUNCTIONS.LSP b/FUNCTIONS.LSP
@@ -143,6 +143,11 @@
 	(Assert 'ListSearch '('(= "a" (nth i theList)) aList) 0)
 	(Assert 'ListSearch '('(= "b" (nth i theList)) aList) 1)
 	(Assert 'ListSearch '('(= "c" (nth i theList)) aList) 2)
+	(setq aList '(1 2 3))
+	(princ aList)(princ "\n")
+	(Assert 'ListSearch '('(<= 1 (nth i theList)) aList) 0)
+	(Assert 'ListSearch '('(<= 2 (nth i theList)) aList) 1)
+	(Assert 'ListSearch '('(<= 3 (nth i theList)) aList) 2)
 
 	;; Displaying the results of the tests
 	(JD:PrintTestResults (JD:CountBooleans testList)))
@@ -228,12 +233,18 @@
 ; Ret: index of item if found, nil if not
 
 (defun ListSearch (criteria theList / n)
-	(if (/= nil theList)
-		(foreach i (Range 0 (1- (length theList)) 1)
-			(if (eval criteria)
-				(setq n i)))
-		(setq n nil))
-		n)
+	(cond
+		(	(/= nil theList)
+			(setq i 0)
+			(while (< i (length theList))
+				(cond
+					(	(eval criteria)
+						(setq n i)
+						(setq i (length theList))))
+				(setq i (1+ i))))
+		( 	T
+			(setq n nil)))
+	n)
 
 
 

diff --git a/MATH.LSP b/MATH.LSP
@@ -9,6 +9,9 @@
 ;;                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                              ;;
+;;  08/30/2016                                  ;;
+;;  - Added unit tests for RoundUpBy.           ;;
+;;                                              ;;
 ;;  03/16/2016                                  ;;
 ;;  - Moved math functions to this file.        ;;
 ;;    No more list and general functions...     ;;
@@ -39,6 +42,24 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 
+; Runs all unit tests for this file
+; Output: T if all unit tests passed, else nil
+
+(defun C:TestMath ( / testList)
+	;; Setup for tests
+	(princ "\n")
+	(princ "Testing MATH\n")
+	(princ "--------------------\n")
+
+	;; Actual tests
+	(princ "RoundUpBy\n")
+	(Assert 'RoundUpBy '(12 12) 12)
+	(Assert 'RoundUpBy '(12 12.0) 12)
+
+	;; Displaying the results of the tests
+	(JD:PrintTestResults (JD:CountBooleans testList)))
+
+
 
 ;; DTR - (Converts) Degrees To Radians - useful for polar command
 ;; angleInDegrees [ integer ]