Skip to content

Function for concatenating rather than replacing #288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
frankmcsherry merged 2 commits into from
Nov 22, 2020
Merged

Function for concatenating rather than replacing #288

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b415029
Function for concatenating rather than replacing
davidspies Nov 10, 2020
3f42cae
Remove accidental whitespace change
davidspies Nov 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions src/operators/iterate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,10 +188,15 @@ impl<G: Scope, D: Data, R: Abelian> Variable<G, D, R> where G::Timestamp: Lattic

/// Adds a new source of data to the `Variable`.
pub fn set(self, result: &Collection<G, D, R>) -> Collection<G, D, R> {
let in_result = self.source.negate().concat(result);
self.set_concat(&in_result)
}


/// Concat a new source of data to the data already in the `Variable`.
pub fn set_concat(self, result: &Collection<G, D, R>) -> Collection<G, D, R> {
let step = self.step;
self.source
.negate()
.concat(result)
result
.inner
.flat_map(move |(x,t,d)| step.results_in(&t).map(|t| (x,t,d)))
.connect_loop(self.feedback);
Expand Down Expand Up @@ -276,4 +281,4 @@ impl<G: Scope, D: Data, R: Semigroup> Deref for SemigroupVariable<G, D, R> where
fn deref(&self) -> &Self::Target {
&self.collection
}
}
}