diff options
| author | Jeffrey Straszheim <straszheimjeffrey@gmail.com> | 2009-03-20 22:03:41 +0000 |
|---|---|---|
| committer | Jeffrey Straszheim <straszheimjeffrey@gmail.com> | 2009-03-20 22:03:41 +0000 |
| commit | 5d0355f71e8b98af425d4149b009ac687cd29bd8 (patch) | |
| tree | 41287c5fccc852f0883a0c775f4107e6319c8abb | |
| parent | 3b4bd7bc6e2fbeb9b7ba698b0dfdd8f5719a4481 (diff) | |
removed current cell from future needed cells
| -rw-r--r-- | src/clojure/contrib/dataflow.clj | 9 | ||||
| -rw-r--r-- | src/clojure/contrib/test_contrib/test_dataflow.clj | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/clojure/contrib/dataflow.clj b/src/clojure/contrib/dataflow.clj index 88b1082a..eed0bad2 100644 --- a/src/clojure/contrib/dataflow.clj +++ b/src/clojure/contrib/dataflow.clj @@ -408,11 +408,12 @@ (let [[changed ov] (try (eval-cell df data old cell) (catch Exception e - (throw (Exception. (str cell) e))))] + (throw (Exception. (str cell) e)))) + nn (disj needed cell)] (if changed - [(union needed (get-neighbors (:fore-graph @df) cell)) + [(union nn (get-neighbors (:fore-graph @df) cell)) (assoc old (:name cell) ov)] - [needed old]))) + [nn old]))) [new-needed new-old] (reduce step [needed old] (intersection now needed))] @@ -490,7 +491,7 @@ (get-value df 'sally) (get-value df 'greg) - (use :reload 'jls.dataflow.dataflow) + (use :reload 'clojure.contrib.dataflow) (use 'clojure.contrib.stacktrace) (e) (use 'clojure.contrib.trace) ) diff --git a/src/clojure/contrib/test_contrib/test_dataflow.clj b/src/clojure/contrib/test_contrib/test_dataflow.clj index f44a9934..9ad327eb 100644 --- a/src/clojure/contrib/test_contrib/test_dataflow.clj +++ b/src/clojure/contrib/test_contrib/test_dataflow.clj @@ -80,7 +80,7 @@ (comment (run-tests) - (use :reload 'jls.dataflow.dataflow) + (use :reload 'clojure.contrib.dataflow) (use 'clojure.contrib.stacktrace) (e) (use 'clojure.contrib.trace) |