translation

sjf · sjf · commit 23a64b32cf12 · 2007-04-30T20:11:17.000Z
diff --git a/eventlogic.scm b/eventlogic.scm
@@ -215,7 +215,7 @@
 
 (define (negate-alphabet a)
   (map (lambda (x) 
-	 (string->symbol (string-append "not" (symbol->string x))))
+	 (string->symbol (string-append "~" (symbol->string x))))
        a))
 
 (define (parse-alphabet s)
@@ -247,7 +247,7 @@
 	       (dfa-remove-never-accepting-states! dfa1)
 	       (dfa-really-minimize! dfa1)
 	       (if *complete?* (dfa-complete! dfa1))
-	       (view (graph dfa1))
+	       (view (graph dfa1 s))
 	       (display "Model > ")
 	       (let* ((model (read))
 		      (result (run-dfa dfa1 model)))
diff --git a/graph.scm b/graph.scm
@@ -12,19 +12,34 @@
 	 (utils "utils.scm"))
 	(export 
 	 (view graph)
-	 (graph state-machine)
+	 (graph state-machine . title)
 	 (graph-to-file state-machine file)))
 
 (define *image-viewer* "eog")
 (define *dot* "dot")
 
-(define (graph state-machine)
-  (cond ((nfa? state-machine)
-	 (graph-nfa state-machine))
-	((dfa? state-machine)
-	 (graph-dfa state-machine))
-	(else
-	 (error "graph" "Can only produce a graph for nfa or dfa" state-machine))))
+(define (graph state-machine . title)
+  (let ((gr (cond ((nfa? state-machine)
+		   (graph-nfa state-machine))
+		  ((dfa? state-machine)
+		   (graph-dfa state-machine))
+		  (else
+		   (error "graph" "Can only produce a graph for nfa or dfa" state-machine)))))
+    (if (null? title)
+	gr
+	(append-dot gr "graph[label=\"~a\"]" (car title)))))
+	    
+(define (append-dot gr fmt s)
+  (close-dot (string-append (open-dot gr) (format fmt s))))
+
+(define (close-dot gr)
+  (string-append gr "}"))
+
+(define (open-dot gr)
+  (let ((sc (string-contains gr "}")))
+    (if sc
+	(string-shrink! gr sc)
+	gr)))
 
 (define (graph-to-file state-machine filename)
   (call-with-output-file
@@ -46,14 +61,15 @@
     node[shape=circle style=solid]
     ~a
 }")
+
 (define dot-final-states
   "node[shape=doublecircle style=solid]
     ~a;")
 
 (define (string-quote x)
   (format "\"~a\"" x))
 
-(define (graph-dfa dfa)
+(define (graph-dfa dfa . args)
   (let* ((final-states (if (null? (dfa-final-states dfa))
 			   ""
 			   (format dot-final-states
@@ -75,7 +91,7 @@
 	    (string-join transitions ""))))
 
 
-(define (graph-nfa nfa)
+(define (graph-nfa nfa . args)
   (let* ((final-states (if (null? (nfa-final-states nfa))
 			   ""
 			   (format dot-final-states
diff --git a/notes b/notes
@@ -9,3 +9,6 @@ dot -Tps -o out.ps  file.dot
 gs -dBATCH -dNOPAUSE -dTextAlphaBits=4 -dGraphicsAlphaBits=4 \
    -sDEVICE=png16m -sOutputFile=out.png out.ps
 
+
+NOTES: negation includes in empty string because it is in the universal consistent language.
+
