new images and more resilient to new replicates

client/htdocs/scm/egglab-common.jscm

@@ -20,7 +20,7 @@
 (define egg-complexity 6)
 (define main-game-url "http://nightjar.exeter.ac.uk/egglab")
 (define replicate-start 0)
-(define num-replicates 1)
+(define num-replicates 2)
 (define num-variations 8)
 
 (define egg-constant-images

client/htdocs/scm/egglab.jscm

@@ -1364,78 +1364,79 @@
 
 (define cf_images
   (list
-"CF/CF005_L_V_2012-c.jpg"
-"CF/CF013_L_V_2012-c.jpg"
-"CF/CF027_L_V_2013-c.jpg"
-"CF/CF002_L_V_2013-c.jpg"
-"CF/CF011_L_V_2012-c.jpg"
-"CF/CF001_L_V_2013-c.jpg"
-"CF/CF005_L_V_2013-c.jpg"
-"CF/CF020_L_V_2012-c.jpg"
-"CF/CF034_L_V_2012-c.jpg"
-"CF/CF031_L_V_2012-c.jpg"
-"CF/CF020_L_V_2013-c.jpg"
-"CF/CF012_L_V_2012-c.jpg"
 "CF/CF001_L_V_2012-c.jpg"
-"CF/CF017_L_V_2012-c.jpg"
-"CF/CF013_L_V_2013-c.jpg"
-"CF/CF011_L_V_2013-c.jpg"
+"CF/CF001_L_V_2013-c.jpg"
+"CF/CF002_L_V_2012-c.jpg"
+"CF/CF002_R_V_2013-c.jpg"
+"CF/CF004_R_V_2012-c.jpg"
+"CF/CF005_L_V_2012-c.jpg"
+"CF/CF005_R_V_2013-c.jpg"
 "CF/CF006_L_V_2013-c.jpg"
+"CF/CF006_R_V_2013-c.jpg"
+"CF/CF008_L_V_2013-c.jpg"
+"CF/CF008_R_V_2013-c.jpg"
 "CF/CF010_L_V_2013-c.jpg"
-"CF/CF016_L_V_2013-c.jpg"
+"CF/CF010_R_V_2013-c.jpg"
+"CF/CF011_L_V_2013-c.jpg"
+"CF/CF012_L_V_2012-c.jpg"
 "CF/CF012_L_V_2013-c.jpg"
+"CF/CF012_R_V_2013-c.jpg"
+"CF/CF013_L_V_2013-c.jpg"
+"CF/CF015_L_V_2012-c.jpg"
+"CF/CF015_R_V_2012-c.jpg"
+"CF/CF016_L_V_2013-c.jpg"
+"CF/CF016_R_V_2013-c.jpg"
+"CF/CF017_L_V_2012-c.jpg"
+"CF/CF018_L_V_2013-c.jpg"
+"CF/CF018_R_V_2013-c.jpg"
+"CF/CF020_L_V_2013-c.jpg"
+"CF/CF022_R_V_2012-c.jpg"
 "CF/CF025_L_V_2012-c.jpg"
+"CF/CF025_R_V_2012-c.jpg"
 "CF/CF026_L_V_2012-c.jpg"
-"CF/CF026_L_V_2013-c.jpg"
-"CF/CF022_R_V_2012-c.jpg"
-"CF/CF008_L_V_2013-c.jpg"
-"CF/CF035_L_V_2012-c.jpg"
+"CF/CF026_R_V_2012-c.jpg"
 "CF/CF027_L_V_2012-c.jpg"
+"CF/CF027_L_V_2013-c.jpg"
+"CF/CF027_R_V_2013-c.jpg"
 "CF/CF028_L_V_2013-c.jpg"
-"CF/CF015_L_V_2012-c.jpg"
-"CF/CF018_L_V_2013-c.jpg"
-"CF/CF002_L_V_2012-c.jpg"))
+"CF/CF031_L_V_2012-c.jpg"))
 
-(define cp-images
+
+(define cp_images
   (list
-"CP/CP012_L_V_2013-c.jpg"
-"CP/CP043_L_V_2013-c.jpg"
-"CP/CP029_L_V_2012-c.jpg"
-"CP/CP001_L_V_2012-c.jpg"
+"CP/CP002_R_V_2013-c.jpg"
+"CP/CP004_R_V_2013-c.jpg"
 "CP/CP005_L_V_2013-c.jpg"
-"CP/CP021_R_V_2013-c.jpg"
-"CP/CP015_R_V_2013-c.jpg"
-"CP/CP024_L_V_2013-c.jpg"
 "CP/CP007_L_V_2013-c.jpg"
+"CP/CP007_R_V_2013-c.jpg"
+"CP/CP008_R_V_2013-c.jpg"
+"CP/CP009_R_V_2013-c.jpg"
+"CP/CP010_L_V_2013-c.jpg"
+"CP/CP010_R_V_2013-c.jpg"
+"CP/CP011_L_V_2012-c.jpg"
+"CP/CP011_R_V_2013-c.jpg"
 "CP/CP012_L_V_2012-c.jpg"
-"CP/CP004_R_V_2013-c.jpg"
-"CP/CP020_L_V_2013-c.jpg"
+"CP/CP013_R_V_2013-c.jpg"
+"CP/CP014_R_V_2012-c.jpg"
+"CP/CP014_R_V_2013-c.jpg"
+"CP/CP015_R_V_2013-c.jpg"
 "CP/CP016_L_V_2012-c.jpg"
-"CP/CP026_L_V_2012-c.jpg"
-"CP/CP001_L_V_2013-c.jpg"
-"CP/CP019_R_V_2012-c.jpg"
-"CP/CP025_L_V_2013-c.jpg"
+"CP/CP016_R_V_2012-c.jpg"
 "CP/CP017_L_V_2012-c.jpg"
-"CP/CP014_L_V_2012-c.jpg"
-"CP/CP041_L_V_2013-c.jpg"
-"CP/CP013_R_V_2013-c.jpg"
-"CP/CP029_L_V_2013-c.jpg"
-"CP/CP032_L_V_2012-c.jpg"
-"CP/CP018_R_V_2013-c.jpg"
-"CP/CP035_L_V_2013-c.jpg"
-"CP/CP019_L_V_2013-c.jpg"
-"CP/CP008_L_V_2013-c.jpg"
-"CP/CP042_L_V_2013-c.jpg"
-"CP/CP030_L_V_2013-c.jpg"
-"CP/CP010_R_V_2013-c.jpg"
 "CP/CP017_L_V_2013-c.jpg"
-"CP/CP015_L_V_2012-c.jpg"
-"CP/CP010_L_V_2012-c.jpg"
-"CP/CP011_R_V_2013-c.jpg"
-"CP/CP014_R_V_2013-c.jpg"
-"CP/CP028_L_V_2013-c.jpg"
-"CP/CP011_L_V_2012-c.jpg"
-"CP/CP033_L_V_2013-c.jpg"
+"CP/CP017_R_V_2012-c.jpg"
+"CP/CP018_R_V_2013-c.jpg"
+"CP/CP019_R_V_2012-c.jpg"
+"CP/CP021_R_V_2013-c.jpg"
 "CP/CP023_L_V_2013-c.jpg"
+"CP/CP024_L_V_2013-c.jpg"
+"CP/CP025_L_V_2013-c.jpg"
 "CP/CP025_R_V_2012-c.jpg"
-"CP/CP009_R_V_2013-c.jpg"))
+"CP/CP025_R_V_2013-c.jpg"
+"CP/CP028_L_V_2013-c.jpg"
+"CP/CP029_L_V_2012-c.jpg"
+"CP/CP029_R_V_2013-c.jpg"
+"CP/CP030_L_V_2013-c.jpg"
+"CP/CP032_L_V_2012-c.jpg"
+"CP/CP035_L_V_2013-c.jpg"
+"CP/CP041_L_V_2013-c.jpg"

server/pop.ss

@@ -206,25 +206,38 @@
             (vector-ref i 1)))
          (cdr s)))))
 
+
+(define (check-replicate/pop db population replicate)
+  (let ((s (select db "select phase from state where population = ? and replicate = ?" population replicate)))
+    (if (null? s)
+        #f (not (equal? (vector-ref (cadr s) 0) "init")))))
+
+(define (check-replicate db replicate)
+  (and
+   (check-replicate/pop db "CF" replicate)
+   (check-replicate/pop db "MV" replicate)
+   (check-replicate/pop db "CP" replicate)))
+
 ;; top n eggs
 (define (top-eggs db population replicate count)
-  (let ((s (select
-            db (string-append
-                "select e.genotype, (e.fitness / e.tests), e.id, e.replicate, e.generation from egg as e "
-                "where e.population = ? and e.replicate = ? "
-                "and e.generation = ? "
-                "order by (e.fitness / e.tests) desc limit ?")
-            population replicate (get-state db population replicate "generation") count)))
-    (if (null? s)
-        '()
-        (map
-         (lambda (i)
-           (list (vector-ref i 0)
-                 (vector-ref i 1)
-                 (vector-ref i 2)
+  (let ((replicate (if (check-replicate db replicate) replicate 0)))
+    (let ((s (select
+              db (string-append
+                  "select e.genotype, (e.fitness / e.tests), e.id, e.replicate, e.generation from egg as e "
+                  "where e.population = ? and e.replicate = ? "
+                  "and e.generation = ? "
+                  "order by (e.fitness / e.tests) desc limit ?")
+              population replicate (get-state db population replicate "generation") count)))
+      (if (null? s)
+          '()
+          (map
+           (lambda (i)
+             (list (vector-ref i 0)
+                   (vector-ref i 1)
+                   (vector-ref i 2)
                  (vector-ref i 3)
                  (vector-ref i 4)))
-         (cdr s)))))
+           (cdr s))))))