Merge pull request #199 from Habush/bug-fixes

Remove the current mult-threading

annotation/main.scm

@@ -118,7 +118,7 @@
                  (biogrid-pairs (make-atom-set))
                  (biogrid-reported-pathways (make-atom-set)))
     (let* ([fns (parse-request genes-list file-name request)]
-           [result (par-map (lambda (x) (x)) fns)] 
+           [result (map (lambda (x) (x)) fns)] 
            [graphs (map (lambda (res) (atomese-parser res)) result)]
            [super-graph (make-graph (append-map (lambda (graph) (graph-nodes graph)) graphs)
                                     (append-map (lambda (graph) (graph-edges graph)) graphs)

annotation/util.scm

@@ -26,13 +26,11 @@
 	#:use-module (opencog bioscience)
 	#:use-module (annotation graph)
 	#:use-module (ice-9 optargs)
-;	#:use-module (rnrs base)
 	#:use-module (rnrs exceptions)
 	#:use-module (ice-9 textual-ports)
 	#:use-module (ice-9 regex)
 	#:use-module (srfi srfi-1)
 	#:use-module (ice-9 match)
-	#:use-module (ice-9 threads)
 	#:export (create-node
 	          create-edge
             write-to-file
@@ -54,9 +52,8 @@
   This differs from ordinary caching/memoizing utilities as it provides
   special handling for Atom arguments.
 "
-	(define mtx (make-mutex))
 	(define cache (make-afunc-cache FUNC))
-	(lambda (ATOM) (with-mutex mtx (cache ATOM)))
+	(lambda (ATOM) (cache ATOM))
 )
 
 ; ----------------------------------------------------