Fix interactive (#533)

Signed-off-by: Moritz Hoffmann <antiguru@gmail.com>

Author: antiguru

Cargo.toml

@@ -21,7 +21,7 @@ members = [
     # "advent_of_code_2017",
     "dogsdogsdogs",
     "experiments",
-    #"interactive",
+    "interactive",
     "server",
     "server/dataflows/degr_dist",
     "server/dataflows/neighborhood",

interactive/Cargo.toml

@@ -9,6 +9,6 @@ publish = false
 bincode = "1"
 serde = { version = "1", features = ["derive"]}
 differential-dataflow = { path = "../" }
-dogsdogsdogs = { path = "../dogsdogsdogs" }
-timely = { git = "https://github.com/TimelyDataflow/timely-dataflow", features = ["bincode"] }
+differential-dogs3 = { path = "../dogsdogsdogs" }
+timely = { workspace = true }
 #timely = { path = "../../timely-dataflow/timely", features = ["bincode"] }

interactive/src/plan/mod.rs

@@ -170,7 +170,7 @@ impl<V: ExchangeData+Hash+Datum> Render for Plan<V> {
                         input_arrangement
                     };
 
-                    let output = input.reduce_abelian::<_,KeySpine<_,_,_>>("Distinct", move |_,_,t| t.push(((), 1)));
+                    let output = input.reduce_abelian::<_,_,_,KeySpine<_,_,_>>("Distinct", move |_,_,t| t.push(((), 1)));
 
                     arrangements.set_unkeyed(&self, &output.trace);
                     output.as_collection(|k,&()| k.clone())

interactive/src/plan/sfw.rs

@@ -230,7 +230,7 @@ impl<V: ExchangeData+Hash+Datum> Render for MultiwayJoin<V> {
             }
 
             // Build the dataflow.
-            use dogsdogsdogs::altneu::AltNeu;
+            use differential_dogs3::altneu::AltNeu;
 
             let scope_name = format!("DeltaRule: {}/{}", index, self.sources.len());
             let changes = scope.clone().scoped::<AltNeu<_>,_,_>(&scope_name, |inner| {
@@ -250,11 +250,11 @@ impl<V: ExchangeData+Hash+Datum> Render for MultiwayJoin<V> {
                     changes =
                     if join_idx < index {
                         let arrangement = trace.import(scope).enter_at(inner, |_,_,t| AltNeu::alt(t.clone()), |_| unimplemented!());
-                        dogsdogsdogs::operators::propose(&changes, arrangement, key_selector)
+                        differential_dogs3::operators::propose(&changes, arrangement, key_selector)
                     }
                     else {
                         let arrangement = trace.import(scope).enter_at(inner, |_,_,t| AltNeu::neu(t.clone()), |_| unimplemented!());
-                        dogsdogsdogs::operators::propose(&changes, arrangement, key_selector)
+                        differential_dogs3::operators::propose(&changes, arrangement, key_selector)
                     }
                     .map(|(mut prefix, extensions)| { prefix.extend(extensions.into_iter()); prefix })
                     ;