Skip to content

Task 52 #53

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
merged 2 commits into from
Sep 18, 2017
Merged

Task 52 #53

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f2905b
Attempt at dealing with duplicate keys.
khatchad Sep 18, 2017
0eaa5d8
Whitespace fix for #52.
khatchad Sep 18, 2017
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions ...actoring.core/src/edu/cuny/hunter/streamrefactoring/core/analysis/StreamStateMachine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,10 +448,18 @@ public void start() throws IOException, CoreException, CallGraphBuilderCancelExc
propagateStreamInstanceProperty(instancesWithSideEffects);

// propagate the instances with stateful intermediate operations.
instanceToStatefulIntermediateOperationContainment
.putAll(instanceToStatefulIntermediateOperationContainment.entrySet().stream().filter(Entry::getValue)
.map(Entry::getKey).flatMap(ik -> getAllPredecessors(ik).stream())
.collect(Collectors.toMap(Function.identity(), v -> true)));
instanceToStatefulIntermediateOperationContainment.entrySet().stream().filter(Entry::getValue)
.map(Entry::getKey).flatMap(ik -> getAllPredecessors(ik).stream())
.collect(Collectors.toMap(Function.identity(), v -> true))
.forEach((k, v) -> instanceToStatefulIntermediateOperationContainment.merge(k, v, (v1, v2) -> {
// if they're the same value, just use the first one.
if (v1 == v2)
return v2;
else
// otherwise, if we have either previously seen an SIO
// or see one now, we should remember that.
return true;
}));

// propagate the instances whose reduce ordering possibly matters.
propagateStreamInstanceProperty(instancesWhoseReduceOrderingPossiblyMatters);
Expand Down