Merge branch 'master' of github.com:abarbu/icfp2013

Makefile

@@ -5,7 +5,6 @@ CC = gcc -Wall -Werror
 
 PACKAGES = medea http-client bind kvlists scheme2c-compatibility nondeterminism traversal
 SOURCES = $(shell find src/ -iname \*.scm -or -iname \*.ss)
-IGNORES = src/main.scm src/more-stuff.scm
 NONEXEC_SOURCES = $(filter-out $(IGNORES), $(SOURCES))
 
 all: setup main

src/main.scm

@@ -1,19 +1,24 @@
-;; TOOD: something
-(declare (uses rpc secret hobostuff))
-(use medea)
-;; For now lets just test if this can call something
-(display "Using secret ")
-(display my-secret)
-(display "\n")
-(display "call result was")
-(define train_results (make-train-call my-secret 3 '()))
-(display train_results)
-(display "\n")
-(display "Eval of above\n")
-(display (make-eval-program-call my-secret (cdr (assoc 'challenge train_results)) (list "0x00000000000001" "0xEFFFFFFFFFFFFF")))
-(display "Eval of shift left\n")
-(display (make-eval-program-call my-secret "(lambda (x) (shl1 x))" (list "0x00000000000001" "0xEFFFFFFFFFFFFF")))
-(display "Eval of shift right\n")
-(display (make-eval-program-call my-secret "(lambda (x) (shr1 x))" (list "0x00000000000001" "0xEFFFFFFFFFFFFF")))
-(display "Status\n")
-(display (make-status-call my-secret))
+(when #f
+ ;; TOOD: something
+ (declare (uses rpc secret))
+ (use medea)
+ ;; For now lets just test if this can call something
+ (display "Using secret ")
+ (display my-secret)
+ (display "\n")
+ (display "call result was")
+ (define train_results (make-train-call my-secret 3 '()))
+ (display train_results)
+ (display "\n")
+ (display "Eval of above\n")
+ (display (make-eval-program-call my-secret (cdr (assoc 'challenge train_results)) (list "0x00000000000001" "0xEFFFFFFFFFFFFF")))
+ (display "Eval of shift left\n")
+ (display (make-eval-program-call my-secret "(lambda (x) (shl1 x))" (list "0x00000000000001" "0xEFFFFFFFFFFFFF")))
+ (display "Eval of shift right\n")
+ (display (make-eval-program-call my-secret "(lambda (x) (shr1 x))" (list "0x00000000000001" "0xEFFFFFFFFFFFFF")))
+ (display "Status\n")
+ (display (make-status-call my-secret)))
+
+(declare (uses rpc secret more-stuff))
+(use stuff scheme2c-compatibility nondeterminism traversal)
+(solve-training-problem 8)

src/more-stuff.scm

@@ -1,3 +1,4 @@
+(declare (unit more-stuff))
 (use stuff scheme2c-compatibility nondeterminism traversal)
 
 (define (read-expr expr)
@@ -185,11 +186,11 @@
 ;; (all-values (an-expression-of-size 3 '(wh#and wh#not) '(x y z)))
 
 (define (solve-training-problem size)
- (let* ((example (values (make-train-call1 key size)))
+ (let* ((example (values (make-train-call1 my-secret size)))
         (inputs (test-sequence))
-        (seq (values (make-eval-program-call key (cdr (assoc 'challenge example)) inputs ))))
+        (seq (values (make-eval-program-call my-secret (cdr (assoc 'challenge example)) inputs ))))
   (display (list example inputs seq))(newline)
-  (make-guess-call key
+  (make-guess-call my-secret
                    (cdr (assoc 'id example))
                    (format #f
                            "~a"