Skip to content

Remove ops.run from codebase #40

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
ctrueden merged 2 commits into from
Feb 14, 2020
Merged

Remove ops.run from codebase #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5cbaaf
Remove ops.run from codebase
gselzer Jan 6, 2020
51d3265
Remove OpRunner and associated code
gselzer Feb 14, 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
20 changes: 0 additions & 20 deletions src/main/java/org/scijava/ops/OpService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,10 @@
import org.scijava.ops.matcher.OpMatchingException;
import org.scijava.ops.matcher.OpRef;
import org.scijava.ops.transform.DefaultOpTransformationMatcher;
import org.scijava.ops.transform.OpRunner;
import org.scijava.ops.transform.OpTransformationCandidate;
import org.scijava.ops.transform.OpTransformationException;
import org.scijava.ops.transform.OpTransformationMatcher;
import org.scijava.ops.transform.OpTransformer;
import org.scijava.ops.types.Any;
import org.scijava.ops.types.Nil;
import org.scijava.ops.types.TypeService;
import org.scijava.ops.util.OpWrapper;
Expand Down Expand Up @@ -324,10 +322,6 @@ private Object wrapOp(Object op, OpCandidate match, OpTransformationCandidate tr
if (wrappers == null)
initWrappers();

// TODO: we don't want to wrap OpRunners, do we? What is the point?
if (OpRunner.class.isInstance(op))
return op;

OpInfo opInfo = match == null ? transformation.getSourceOp().opInfo() : match.opInfo();
// FIXME: this type is not necessarily Computer, Function, etc. but often
// something more specific (like the class of an Op).
Expand Down Expand Up @@ -367,20 +361,6 @@ private Type[] toTypes(Nil<?>... nils) {
return Arrays.stream(nils).filter(n -> n != null).map(n -> n.getType()).toArray(Type[]::new);
}

public Object run(final String opName, final Object... args) {

Nil<?>[] inTypes = Arrays.stream(args).map(arg -> Nil.of(typeService.reify(arg))).toArray(Nil[]::new);
Nil<?> outType = new Nil<Any>() {
@Override
public Type getType() {
return new Any();
}
};

OpRunner op = findOpInstance(opName, new Nil<OpRunner>() {}, inTypes, outType);
return op.run(args);
}

/**
* Tries to infer a {@link OpRef} from a functional Op type. E.g. the type:
*
Expand Down
239 changes: 0 additions & 239 deletions src/main/java/org/scijava/ops/transform/FunctionalToOpRunnerTransformer.java
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions src/main/java/org/scijava/ops/transform/OpRunner.java
View file
Open in desktop

This file was deleted.

Loading