Merge pull request #52 from andersvi/master

mmaul · web-flow · commit c34cc7a7c041 · 2022-02-18T11:31:51.000-05:00
typo :external-format - lispworks
diff --git a/clustering/misc/k-means-bench.lisp b/clustering/misc/k-means-bench.lisp
@@ -9,7 +9,9 @@
 (time (k-means 20 dataset
                :distance-fn #'manhattan-distance
                :max-iteration 100
-               :random-state (k-means::make-random-state-with-seed 3)
+               :random-state
+               #+lispworks *random-state*
+	       #-lispworks (clml.hjs.k-means:make-random-state-with-seed 0)
                :standardization t))
 
 
diff --git a/test/src/test-changefinder.lisp b/test/src/test-changefinder.lisp
@@ -13,11 +13,11 @@
                   :external-format :utf-8)
                  :except '(0) :time-label 0)))
       (assert-equality #'= 1015 (length (ts-points ts)))
-      #- allegro (assert (setf cf (init-changefinder (sub-ts ts :start 0 :end 24)
+      #- (or allegro lispworks) (assert (setf cf (init-changefinder (sub-ts ts :start 0 :end 24)
                                                :score-type :log
                                                :ts-wsize 5 :score-wsize 5 :sdar-k 4
                                                :discount 0.005d0)))
-      #- allegro (mapcar (lambda (v1 v2) (assert-equality #'epsilon> v2 v1))
+      #- (or allegro lispworks) (mapcar (lambda (v1 v2) (assert-equality #'epsilon> v2 v1))
               (loop for p across (ts-points (sub-ts ts :start 600 :end 700))
                     as new-dvec = (ts-p-pos p)
                     collect (update-changefinder cf new-dvec))
diff --git a/test/src/test-cluster-validation.lisp b/test/src/test-cluster-validation.lisp
@@ -16,11 +16,11 @@
                          :except '(0) :data-types (make-list 4
                                                              :initial-element :numeric))
                         :random-state
-                        (clml.hjs.k-means:make-random-state-with-seed 0))))
+			#+lispworks *random-state*
+                        #-lispworks (clml.hjs.k-means:make-random-state-with-seed 0))))
     (print (list (calinski) 441.62300853729414))
     (assert-true (epsilon> (calinski)
-                           #+ (or lispworks) 441.62300853729414
-                           #- (or lispworks) 441.8562453167574d0))
+			   441.8562453167574d0 ))
     (print (list (hartigan) (ball-and-hall) (dunn-index :distance :euclid
                                        :intercluster :hausdorff
                                                     :intracluster :centroid)
@@ -30,21 +30,21 @@
                  (global-silhouette-value :distance :euclid)
                  ))
     (assert-true (epsilon> (hartigan)
-                           #+ (or lispworks) 2.5069376578154543
-                          #- (or lispworks) 2.5074656538807005d0))
+                           2.5074656538807005d0
+			   ))
     (assert-true (epsilon> (ball-and-hall)
-                           #+ (or lispworks) 1128.3210196476964
-                           #- (or lispworks)   1127.7702976190476d0))
+			   1127.7702976190476d0
+			   ))
     (assert-true (epsilon> (dunn-index :distance :euclid
                                        :intercluster :hausdorff
                                        :intracluster :centroid)
-                           #+ (or lispworks) 1.218510772099368
-                           #- (or lispworks)  1.2576613811360222d0))
+			   1.2576613811360222d0
+			   ))
     (assert-true (epsilon> (davies-bouldin-index :distance :euclid
                                                  :intercluster :average
                                                  :intracluster :complete)
-                           #+ (or lispworks) 1.8817487113136586
-                           #- (or lispworks) 1.899415427296523d0))
+                           1.899415427296523d0
+			   ))
     (assert-true (epsilon> (global-silhouette-value :distance :euclid)
-                           #+ (or lispworks) 0.5793276055727323
-                           #- (or lispworks) 0.5786560352400679d0 ))))
+                           0.5786560352400679d0
+			   ))))
diff --git a/test/src/test-hc.lisp b/test/src/test-hc.lisp
@@ -25,11 +25,11 @@
       (assert-equalp #2A((-5 -1) (-4 -2) (2 0) (-6 1) (-3 3) (4 5)) merge-matrix)
       ;;complete
       (multiple-value-setq (cophenetic-matrix merge-matrix) (cophenetic-matrix d-matrix #'hc-complete))
-      (assert-eql 91.53141537199127d0 (aref cophenetic-matrix 0 1))
+      (assert-eql #+lispworks 91.53141537199125D0 #-lispworks 91.53141537199127d0 (aref cophenetic-matrix 0 1))
       (assert-equalp #2A((-5 -1) (-4 -2) (2 0) (-6 1) (-3 3) (4 5)) merge-matrix)
       ;;centroid
       (multiple-value-setq (cophenetic-matrix merge-matrix) (cophenetic-matrix d-matrix #'hc-centroid))
-      (assert-eql 44.02758328256393d0 (aref cophenetic-matrix 0 1))
+      (assert-eql #+lispworks 44.02758328256392D0 #-lispworks 44.02758328256393d0 (aref cophenetic-matrix 0 1))
       (assert-equalp #2A((-5 -1) (-4 -2) (2 0) (-6 1) (-3 3) (4 5)) merge-matrix)
       ;;median
       (multiple-value-setq (cophenetic-matrix merge-matrix) (cophenetic-matrix d-matrix #'hc-median))
diff --git a/test/src/test-k-means.lisp b/test/src/test-k-means.lisp
@@ -4,7 +4,7 @@
 (define-test test-sample-k-means
     (let (dataset centroids result)
       (assert
-       (setf dataset (read-data-from-file (clml.utility.data:fetch "https://mmaul.github.io/clml.data/sample/pos.sexp") :external-format #+allegro :932 #+sbcl :sjis #+ccl :Windows-31j #+lispworks :sjisj)))
+       (setf dataset (read-data-from-file (clml.utility.data:fetch "https://mmaul.github.io/clml.data/sample/pos.sexp") :external-format #+allegro :932 #+sbcl :sjis #+ccl :Windows-31j #+lispworks :sjis)))
       (assert
        (setf dataset
          (pick-and-specialize-data dataset :range '(2 3) :data-types '(:numeric :numeric))))
diff --git a/test/src/test-optics.lisp b/test/src/test-optics.lisp
@@ -5,4 +5,4 @@
     (assert-true
      (optics (clml.utility.data:fetch "https://mmaul.github.io/clml.data/sample/syobu.csv") 10 2 10 '("&#12364;&#12367;&#38263;" "&#12364;&#12367;&#24133;" "&#33457;&#12403;&#12425;&#38263;" "&#33457;&#12403;&#12425;&#24133;")
              :file-type :csv :csv-type-spec '(string integer integer integer integer)
-             :distance :manhattan :external-format #+allegro :932 #+sbcl :sjis #+ccl :Windows-31j)))
+             :distance :manhattan :external-format #+lispworks :sjis #+allegro :932 #+sbcl :sjis #+ccl :Windows-31j)))
diff --git a/test/src/test-som.lisp b/test/src/test-som.lisp
@@ -18,7 +18,8 @@
      (do-som-by-filename (clml.utility.data:fetch "https://mmaul.github.io/clml.data/sample/som/animal.dat") "hexa" "gaussian"
                          24 16 123 10000 5 2400 10
        '(:absolute #+unix "tmp" #+mswindows "temp")))
-  #+ (or sbcl ccl allegro)
+  ;; #+ (or sbcl ccl allegro)
+  #+ (or sbcl ccl allegro lispworks)
   (assert-true (string= (concatenate 'string
                            (format nil "~%in-data-file [~s]~%" (clml.utility.data:fetch "https://mmaul.github.io/clml.data/sample/som/animal.dat"))
                            (format nil "s-topol[hexa] s-neigh[gaussian] xdim[24] ydim[16] nrand[123]~%")
diff --git a/test/src/test-ts-burst-detection.lisp b/test/src/test-ts-burst-detection.lisp
@@ -41,17 +41,6 @@
          (with-output-to-string (s str)
            (print-burst-indices bi :stream s))
          str)
-       #+  lispworks "   0.0 |
- 410.0 |+
- 450.0 |++
- 565.0 |+++
- 570.0 |+
- 600.0 |
- 710.0 |+
- 780.0 |
-1000.0 |
-"
-       #+ (not lispworks)
        "   0.0d0 |
  410.0d0 |+
  450.0d0 |++
