X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?p=jars.git;a=blobdiff_plain;f=run-mars.scm;h=01dd2719cf71c43521f1198422f1c6c787f99d86;hp=db5a8b5f486c0e7323344251f6097ac60035a7f3;hb=865c1d7803580802c1f6048be60f7358e87b50e4;hpb=5dd63750e8c44fb6fbf2c8c0b1c01ef564d08f99

diff --git a/run-mars.scm b/run-mars.scm
index db5a8b5..01dd271 100644
--- a/run-mars.scm
+++ b/run-mars.scm
@@ -12,13 +12,15 @@
              (colors-left colors))
     (if (null? progs-left)
         entries
-        (let ((this-prog (car progs-left))
-              (this-col (car colors-left)))
-          (loop (cons (cons (prog-name this-prog) this-col) entries)
-                (cdr progs-left)
-                (cdr colors-left))))))
+        (if (null? colors-left)
+            (error "Not enough colours in colour map!")
+            (let ((this-prog (car progs-left))
+                  (this-col (car colors-left)))
+              (loop (cons (cons (prog-name this-prog) this-col) entries)
+                    (cdr progs-left)
+                    (cdr colors-left)))))))
 
-(define (mars-runner files iters core-size visualization)
+(define (mars-runner files iters core-size visualization min-queue-count)
   (print "Iters: " iters ", core size: " core-size)
   (let* ((progs (map
                  (lambda (fname)
@@ -28,15 +30,11 @@
                    (let* ((colors '("red" "blue" "green" "magenta" "cyan"))
                           (color-map (make-color-map progs colors))
                           (vis (make-vis 640 480 core-size color-map)))
-                     (make-core 8000 (lambda (i n)
-                                       (vis 'update-owner i n))))
-                   (make-core 8000)))
-         (queues (run-mars core (install-progs core progs) iters)))
-    (for-each (lambda (q)
-                (print)
-                (print "Final queue for " (queue-owner q) ":")
-                (dump-queue q core))
-              queues)
+                     (make-core core-size (lambda (i n)
+                                            (vis 'update-owner i n))))
+                   (make-core core-size)))
+         (queues (run-mars core (install-progs core progs) iters min-queue-count)))
+    (dump-queues queues core)
     (when visualization
       (print* "Press enter to finish...")
       (read-line))))
@@ -45,23 +43,28 @@
   (print "Usage: run-mars [-h|--help]\n"
          "       run-mars [-c|--core size]\n"
          "                [-i|--iterations iters]\n"
-         "                [-n|--no-visualization]\n"
+         "                [-v|--visualization]\n"
+         "                [-m|--min-queue-count]\n"
          "                warrior1.red [warrior2.red [...]]"))
 
 (define (main)
   (let loop ((args (cdr (argv)))
              (iters 10000)
              (core-size 8000)
-             (visualization #t))
+             (visualization #f)
+             (min-queue-count 2))
     (match args
       ((or () ((or "-h" "--help")))
        (print-usage))
       (((or "-i" "--iterations") istr rest ...)
-       (loop rest (string->number istr) core-size visualization))
+       (loop rest (string->number istr) core-size visualization min-queue-count))
       (((or "-c" "--core-size") cstr rest ...)
-       (loop rest iters (string->number cstr) visualization))
-      (((or "-n" "--no-visualization") rest ...)
-       (loop rest iters core-size #f))
+       (loop rest iters (string->number cstr) visualization min-queue-count))
+      (((or "-v" "--visualization") rest ...)
+       (loop rest iters core-size #t min-queue-count))
+      (((or "-m" "--min-queue-count") mstr rest ...)
+       (loop rest iters core-size visualization (string->number mstr)))
       ((files ...)
-       (mars-runner files iters core-size visualization)))))
+       (mars-runner files iters core-size visualization min-queue-count)))))
+
 (main)