-
Notifications
You must be signed in to change notification settings - Fork 109
Adds Number Threshold, Count Contours, and Crop Operations #600
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.
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
Closed
JLLeitschuh
wants to merge
1
commit into
WPIRoboticsProjects:master
from
JLLeitschuh:feat/MeRPG_operations
+179
−0
Closed
Changes from all commits
Commits
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
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
49 changes: 49 additions & 0 deletions
49
...main/java/edu/wpi/grip/core/operations/templated/OneSourceReturnDestinationOperation.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| package edu.wpi.grip.core.operations.templated; | ||
|
|
||
|
|
||
| import com.google.common.collect.ImmutableList; | ||
| import edu.wpi.grip.core.Operation; | ||
| import edu.wpi.grip.core.sockets.InputSocket; | ||
| import edu.wpi.grip.core.sockets.OutputSocket; | ||
| import edu.wpi.grip.core.sockets.SocketHint; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| @SuppressWarnings("PMD.GenericsNaming") | ||
| class OneSourceReturnDestinationOperation<T1, R> implements Operation { | ||
| private final InputSocket<T1> input1; | ||
| private final OutputSocket<R> output; | ||
| private final Performer<T1, R> performer; | ||
|
|
||
| @FunctionalInterface | ||
| public interface Performer<T1, R> { | ||
| R perform(T1 src1); | ||
| } | ||
|
|
||
| OneSourceReturnDestinationOperation(InputSocket.Factory inputSocketFactory, | ||
| OutputSocket.Factory outputSocketFactory, | ||
| SocketHint<T1> t1SocketHint, | ||
| SocketHint<R> rSocketHint, | ||
| Performer<T1, R> performer) { | ||
| this.input1 = inputSocketFactory.create(t1SocketHint); | ||
| this.output = outputSocketFactory.create(rSocketHint); | ||
| assert output.getValue().isPresent() : TemplateFactory.ASSERTION_MESSAGE; | ||
| this.performer = performer; | ||
| } | ||
|
|
||
| @Override | ||
| public List<InputSocket> getInputSockets() { | ||
| return ImmutableList.of(input1); | ||
| } | ||
|
|
||
| @Override | ||
| public List<OutputSocket> getOutputSockets() { | ||
| return ImmutableList.of(output); | ||
| } | ||
|
|
||
| @Override | ||
| @SuppressWarnings("OptionalGetWithoutIsPresent") | ||
| public void perform() { | ||
| output.setValue(performer.perform(input1.getValue().get())); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
59 changes: 59 additions & 0 deletions
59
...in/java/edu/wpi/grip/core/operations/templated/ThreeSourceReturnDestinationOperation.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| package edu.wpi.grip.core.operations.templated; | ||
|
|
||
|
|
||
| import com.google.common.collect.ImmutableList; | ||
| import edu.wpi.grip.core.Operation; | ||
| import edu.wpi.grip.core.sockets.InputSocket; | ||
| import edu.wpi.grip.core.sockets.OutputSocket; | ||
| import edu.wpi.grip.core.sockets.SocketHint; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| @SuppressWarnings("PMD.GenericsNaming") | ||
| class ThreeSourceReturnDestinationOperation<T1, T2, T3, R> implements Operation { | ||
| private final InputSocket<T1> input1; | ||
| private final InputSocket<T2> input2; | ||
| private final InputSocket<T3> input3; | ||
| private final OutputSocket<R> output; | ||
| private final Performer<T1, T2, T3, R> performer; | ||
|
|
||
| @FunctionalInterface | ||
| public interface Performer<T1, T2, T3, R> { | ||
| R perform(T1 src1, T2 src2, T3 src3); | ||
| } | ||
|
|
||
| ThreeSourceReturnDestinationOperation( | ||
| InputSocket.Factory inputSocketFactory, | ||
| OutputSocket.Factory outputSocketFactory, | ||
| SocketHint<T1> t1SocketHint, | ||
| SocketHint<T2> t2SocketHint, | ||
| SocketHint<T3> t3SocketHint, | ||
| SocketHint<R> rSocketHint, | ||
| Performer<T1, T2, T3, R> performer) { | ||
| this.performer = performer; | ||
| this.input1 = inputSocketFactory.create(t1SocketHint); | ||
| this.input2 = inputSocketFactory.create(t2SocketHint); | ||
| this.input3 = inputSocketFactory.create(t3SocketHint); | ||
| this.output = outputSocketFactory.create(rSocketHint); | ||
| assert output.getValue().isPresent() : TemplateFactory.ASSERTION_MESSAGE; | ||
| } | ||
|
|
||
| @Override | ||
| public List<InputSocket> getInputSockets() { | ||
| return ImmutableList.of(input1, input2, input3); | ||
| } | ||
|
|
||
| @Override | ||
| public List<OutputSocket> getOutputSockets() { | ||
| return ImmutableList.of(output); | ||
| } | ||
|
|
||
| @Override | ||
| @SuppressWarnings("OptionalGetWithoutIsPresent") | ||
| public void perform() { | ||
| output.setValue(performer.perform( | ||
| input1.getValue().get(), | ||
| input2.getValue().get(), | ||
| input3.getValue().get())); | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Doesn't this make the dst an Input?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No. But the Crop operation should be in its own class file like every other custom operation.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wait... SocketHints.Inputs.createMatSocketHint() can be used to create a socket hint used for an output? Isn't that a bit misleading?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yep.
SocketHintsneeds an overhaul (and Javadocs).Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How so? What are you thinking about this? I agree with needing an overhaul but I want to know what your thoughts are. This overhaul needs to be done before we expose python bindings.
Open an issue and we can discuss that there.