X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Ftest.scm;h=45bdef541de5ae3c5dbd1d7afb6554da99db0955;hb=0f49b8fac5821694a2db6f88b95423e5ad8aa719;hp=8b7723fa8f6c7234955422f9386ed671ccf86b9f;hpb=1b809e1a58ec2a94903b4b44101d706fd0f27c81;p=gacela.git

diff --git a/src/test.scm b/src/test.scm
index 8b7723f..45bdef5 100644
--- a/src/test.scm
+++ b/src/test.scm
@@ -30,45 +30,45 @@
   (let ((entities '())
 	(components '())
 	(key #f))
-    (receive (e c k) (new-entity `((a . ,(make-a 1 2)) (b . ,(make-b))) entities components)
+    (receive (e c k) (new-entity (list (make-a 1 2) (make-b)) entities components)
 	     (set! entities e)
 	     (set! components c)
 	     (set! key k)
 	     (display k) (newline))
-    (format #t "~a~%~a~%~%" entities components)
+    (format #t "New entity with a and b:~%~a~%~a~%~%" entities components)
 
-    (receive (e c k) (new-entity `((a . ,(make-a 10 20))) entities components)
+    (receive (e c k) (new-entity (list (make-a 10 20)) entities components)
 	     (set! entities e)
 	     (set! components c)
 	     (display k) (newline))
-    (format #t "~a~%~a~%~%" entities components)
+    (format #t "New entity with a:~%~a~%~a~%~%" entities components)
 
-    (receive (e c) (set-entity-components key `((b . #f) (a . ,(make-a 50 50))) entities components)
+    (receive (e c) (set-entity-components key `((b . #f) ,(make-a 50 50)) entities components)
 	     (set! entities e)
 	     (set! components c))
-    (format #t "~a~%~a~%~%" entities components)
+    (format #t "First entity removes b and changes a:~%~a~%~a~%~%" entities components)
 
     (receive (e c) (remove-entity key entities components)
 	     (set! entities e)
 	     (set! components c))
-    (format #t "~a~%~a~%~%" entities components)
+    (format #t "Removes first entity:~%~a~%~a~%~%" entities components)
 
-    (receive (e c k) (new-entity `((a . ,(make-a 1 2)) (b . ,(make-b))) entities components)
+    (receive (e c k) (new-entity (list (make-a 1 2) (make-b)) entities components)
 	     (set! entities e)
 	     (set! components c)
 	     (set! key k)
 	     (display k) (newline))
-    (format #t "~a~%~a~%~%" entities components)
+    (format #t "New entity with a and b:~%~a~%~a~%~%" entities components)
 
-    (receive (e c) (set-entities `((,key . ((b . #f) (a . ,(make-a 50 50)))) (#f . ((a . ,(make-a 1000 1000))))) entities components)
+    (receive (e c) (set-entities `((,key . ((b . #f) ,(make-a 50 50))) (#f . (,(make-a 1000 1000)))) entities components)
 	     (set! entities e)
 	     (set! components c))
-    (format #t "~a~%~a~%~%" entities components)
+    (format #t "Last entity removes b and changes a, and new entity with a:~%~a~%~a~%~%" entities components)
 
     (receive (e c) (set-entities `((,key . #f)) entities components)
 	     (set! entities e)
 	     (set! components c))
-    (format #t "~a~%~a~%~%" entities components)
+    (format #t "Remove last entity:~%~a~%~a~%~%" entities components)
 ))
 
 (export test1)
@@ -77,12 +77,46 @@
 (define (test2)
   (let ((entities '())
 	(components '()))
-    (receive (e c) (((make-system '() (lambda (e) `((#f . ((a . ,(make-a 1 2)))) (#f . ((a . ,(make-a 10 20))))))) entities components))
+    (receive (e c) (((make-system '() (lambda (e) `((#f . (,(make-a 1 2))) (#f . (,(make-a 10 20)))))) entities components))
 	     (set! entities e)
 	     (set! components c))
-    (format #t "~a~%~a~%~%" entities components)
+    (format #t "Two new entities with a:~%~a~%~a~%~%" entities components)
 
     (((make-system '(a) (lambda (e) (display e) (newline) '())) entities components))
 ))
 
 (export test2)
+
+
+(define (test3)
+  (let ((entities '())
+	(components '())
+	(s1 (make-system '(l)
+	      (lambda (e)
+		(map
+		 (lambda (e1)
+		   `(,(car e1) . ((l . (cons 1 (cdr e1)))))
+		 e)))))
+	(s2 (make-system '(l)
+	      (lambda (e)
+		(map
+		 (lambda (e1)
+		   `(,(car e1) . ((l . (cons 2 (cdr e1))))))
+		 e)))))
+    (receive (e c) (set-entities `((#f . ((l . ()))) (#f . ((l . ())))) entities components)
+      ((join-systems s1 s2) e c))))
+
+(export test3)
+
+
+(define (test4)
+  (let ((f1 (lambda (e c) (sleep 3) (lambda (e2 c2) (values (+ 1 e2) c2))))
+	(f2 (lambda (e c) (sleep 4) (lambda (e2 c2) (values e2 (+ 10 c2))))))
+    (let ((t (current-time)))
+      (receive (e c) ((join-systems f1 f2) 2 2) (format #t "~a~%~a~%" e c))
+      (display (- (current-time) t)) (newline) (newline))
+    (let ((t (current-time)))
+      (receive (e c) ((threaded-systems f1 f2) 2 2) (format #t "~a~%~a~%" e c))
+      (display (- (current-time) t)) (newline) (newline))))
+
+(export test4)