Skip to content

Commit fd67f38

Browse files
gselzerctrueden
gselzer
and
ctrueden
committed
Update remaining InfoChain references to InfoTree
Co-authored-by: Curtis Rueden <ctrueden@wisc.edu>
1 parent 90b8b82 commit fd67f38

File tree

8 files changed

+42
-42
lines changed

8 files changed

+42
-42
lines changed

‎scijava-ops-api/src/main/java/org/scijava/ops/api/OpEnvironment.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -179,11 +179,11 @@ default <T> T op( //
179179
<T> T op(final String opName, final Nil<T> specialType,
180180
final Nil<?>[] inTypes, final Nil<?> outType, Hints hints);
181181

182-
default <T> T opFromInfoChain(InfoTree tree, Nil<T> specialType) {
183-
return opFromInfoChain(tree, specialType, getDefaultHints());
182+
default <T> T opFromInfoTree(InfoTree tree, Nil<T> specialType) {
183+
return opFromInfoTree(tree, specialType, getDefaultHints());
184184
}
185185

186-
<T> T opFromInfoChain(InfoTree tree, Nil<T> specialType, Hints hints);
186+
<T> T opFromInfoTree(InfoTree tree, Nil<T> specialType, Hints hints);
187187

188188
/**
189189
* Returns an Op fitting the provided arguments.
@@ -197,7 +197,7 @@ default <T> T opFromSignature(final String signature,
197197
final Nil<T> specialType)
198198
{
199199
InfoTree info = treeFromID(signature);
200-
return opFromInfoChain(info, specialType);
200+
return opFromInfoTree(info, specialType);
201201
}
202202

203203
InfoTree treeFromID(final String signature);

‎scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultInfoTreeGenerator.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@ public InfoTree generate(OpEnvironment env, String signature,
5454
String dependencySignature = signature.substring(dependencyStart + 1,
5555
dependencyEnd);
5656
List<String> dependencies = getDependencies(dependencySignature);
57-
List<InfoTree> dependencyChains = new ArrayList<>();
57+
List<InfoTree> dependencyTrees = new ArrayList<>();
5858
for (String dep : dependencies) {
59-
dependencyChains.add(InfoTreeGenerator.generateDependencyTree(env, dep,
59+
dependencyTrees.add(InfoTreeGenerator.generateDependencyTree(env, dep,
6060
idMap, generators));
6161
}
62-
return new InfoTree(info, dependencyChains);
62+
return new InfoTree(info, dependencyTrees);
6363
}
6464

6565
private List<String> getDependencies(String signature) {

‎scijava-ops-engine/src/main/java/org/scijava/ops/engine/impl/DefaultOpEnvironment.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ public InfoTree treeFromInfo(OpInfo info, Nil<?> specialType, Hints hints) {
221221
}
222222

223223
@Override
224-
public <T> T opFromInfoChain(final InfoTree tree, final Nil<T> specialType,
224+
public <T> T opFromInfoTree(final InfoTree tree, final Nil<T> specialType,
225225
Hints hints)
226226
{
227227
if (!(specialType.type() instanceof ParameterizedType))
@@ -514,9 +514,9 @@ private OpInstance<?> instantiateOp(final OpCandidate candidate,
514514
Hints hints)
515515
{
516516
final List<RichOp<?>> conditions = resolveOpDependencies(candidate, hints);
517-
InfoTree adaptorChain = new DependencyRichOpInfoTree(candidate.opInfo(),
517+
InfoTree adaptorTree = new DependencyRichOpInfoTree(candidate.opInfo(),
518518
conditions);
519-
return adaptorChain.newInstance(candidate.getType());
519+
return adaptorTree.newInstance(candidate.getType());
520520
}
521521

522522
/**
@@ -639,7 +639,7 @@ private List<RichOp<?>> resolveOpDependencies(OpInfo info,
639639
BaseOpHints.History.IGNORE //
640640
).minus(BaseOpHints.Progress.TRACK);
641641
// Then, match dependencies
642-
final List<RichOp<?>> dependencyChains = new ArrayList<>();
642+
final List<RichOp<?>> dependencies = new ArrayList<>();
643643
for (final OpDependencyMember<?> dependency : Infos.dependencies(info)) {
644644
final OpRequest request = inferOpRequest(dependency,
645645
dependencyTypeVarAssigns);
@@ -649,7 +649,7 @@ private List<RichOp<?>> resolveOpDependencies(OpInfo info,
649649
var conditions = MatchingConditions.from(request, depHints);
650650
OpInstance<?> instance = generateCacheHit(conditions);
651651
// add Op to dependencies
652-
dependencyChains.add(wrapOp(instance, conditions));
652+
dependencies.add(wrapOp(instance, conditions));
653653
// refine current type variable knowledge
654654
GenericAssignability //
655655
.inferTypeVariables(request.type(), instance.type()) //
@@ -666,7 +666,7 @@ private List<RichOp<?>> resolveOpDependencies(OpInfo info,
666666
throw new DependencyMatchingException(message);
667667
}
668668
}
669-
return dependencyChains;
669+
return dependencies;
670670
}
671671

672672
private OpRequest inferOpRequest(OpDependencyMember<?> dependency,

‎scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/adapt/AdaptationMatchingRoutine.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,9 @@ public OpCandidate findMatch(MatchingConditions conditions, OpMatcher matcher,
146146
// And return the Adaptor, wrapped up into an OpCandidate
147147
Type adapterOpType = Types.unroll(adaptor.output()
148148
.type(), map);
149-
InfoTree adaptorChain = new InfoTree(adaptor, depTrees);
149+
InfoTree adaptorTree = new InfoTree(adaptor, depTrees);
150150
OpAdaptationInfo adaptedInfo = new OpAdaptationInfo(srcCandidate
151-
.opInfo(), adapterOpType, adaptorChain);
151+
.opInfo(), adapterOpType, adaptorTree);
152152
OpCandidate adaptedCandidate = new OpCandidate(env, conditions
153153
.request(), adaptedInfo, map);
154154
adaptedCandidate.setStatus(StatusCode.MATCH);

‎scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/adapt/OpAdaptationInfo.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,15 @@ public class OpAdaptationInfo implements OpInfo {
6363
protected static final String ORIGINAL = "|OriginalOp:";
6464

6565
private final OpInfo srcInfo;
66-
private final InfoTree adaptorChain;
66+
private final InfoTree adaptorTree;
6767
private final Type type;
6868
private final Hints hints;
6969

7070
private Struct struct;
7171

72-
public OpAdaptationInfo(OpInfo srcInfo, Type type, InfoTree adaptorChain) {
72+
public OpAdaptationInfo(OpInfo srcInfo, Type type, InfoTree adaptorTree) {
7373
this.srcInfo = srcInfo;
74-
this.adaptorChain = adaptorChain;
74+
this.adaptorTree = adaptorTree;
7575
this.type = type;
7676
this.hints = srcInfo.declaredHints().plus(Adaptation.FORBIDDEN);
7777

@@ -118,7 +118,7 @@ public double priority() {
118118

119119
@Override
120120
public String implementationName() {
121-
return srcInfo.implementationName() + ADAPTOR + adaptorChain.signature();
121+
return srcInfo.implementationName() + ADAPTOR + adaptorTree.signature();
122122
}
123123

124124
/**
@@ -128,7 +128,7 @@ public String implementationName() {
128128
public StructInstance<?> createOpInstance(List<?> dependencies) {
129129
@SuppressWarnings("unchecked")
130130
OpInstance<Function<Object, Object>> adaptorInstance =
131-
(OpInstance<Function<Object, Object>>) adaptorChain.newInstance(
131+
(OpInstance<Function<Object, Object>>) adaptorTree.newInstance(
132132
new Nil<Function<Object, Object>>()
133133
{}.type());
134134
final Object op = srcInfo.createOpInstance(dependencies).object();
@@ -150,7 +150,7 @@ public AnnotatedElement getAnnotationBearer() {
150150
*/
151151
@Override
152152
public String version() {
153-
return adaptorChain.info().version();
153+
return adaptorTree.info().version();
154154
}
155155

156156
/**
@@ -171,7 +171,7 @@ public String version() {
171171
*/
172172
@Override
173173
public String id() {
174-
return IMPL_DECLARATION + ADAPTOR + adaptorChain.signature() + ORIGINAL +
174+
return IMPL_DECLARATION + ADAPTOR + adaptorTree.signature() + ORIGINAL +
175175
srcInfo.id();
176176
}
177177

@@ -183,7 +183,7 @@ public String toString() {
183183
StringBuilder sb = new StringBuilder();
184184
sb.append(srcInfo.implementationName());
185185
sb.append("\n\tAdaptor: ");
186-
sb.append(adaptorChain.toString().replace("\n", "\n\t"));
186+
sb.append(adaptorTree.toString().replace("\n", "\n\t"));
187187

188188
int nameBreak = description.indexOf('\n');
189189
sb.append(description.substring(nameBreak));

‎scijava-ops-engine/src/main/java/org/scijava/ops/engine/matcher/convert/ConvertedInfoTreeGenerator.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,10 @@ public InfoTree generate(OpEnvironment env, String signature,
8181
ConvertedOpInfo.PRECONVERTER_DELIMITER + ")");
8282
String preconverterSignature = preconverterComp.substring(
8383
ConvertedOpInfo.PRECONVERTER_DELIMITER.length());
84-
InfoTree preconverterChain = InfoTreeGenerator.generateDependencyTree(env,
84+
InfoTree preconverterTree = InfoTreeGenerator.generateDependencyTree(env,
8585
preconverterSignature, idMap, generators);
8686

87-
preconverters.add(Ops.rich(env.opFromInfoChain(preconverterChain,
87+
preconverters.add(Ops.rich(env.opFromInfoTree(preconverterTree,
8888
FUNCTION_NIL, dependencyHints)));
8989
}
9090

@@ -96,10 +96,10 @@ public InfoTree generate(OpEnvironment env, String signature,
9696
ConvertedOpInfo.POSTCONVERTER_DELIMITER + ")");
9797
String postconverterSignature = postconverterComp.substring(
9898
ConvertedOpInfo.POSTCONVERTER_DELIMITER.length());
99-
InfoTree postconverterChain = InfoTreeGenerator.generateDependencyTree(env,
99+
InfoTree postconverterTree = InfoTreeGenerator.generateDependencyTree(env,
100100
postconverterSignature, idMap, generators);
101-
RichOp<Function<?, ?>> postconverter = Ops.rich(env.opFromInfoChain(
102-
postconverterChain, FUNCTION_NIL, dependencyHints));
101+
RichOp<Function<?, ?>> postconverter = Ops.rich(env.opFromInfoTree(
102+
postconverterTree, FUNCTION_NIL, dependencyHints));
103103

104104
// output copier
105105
RichOp<Computers.Arity1<?, ?>> copier = null;
@@ -113,7 +113,7 @@ public InfoTree generate(OpEnvironment env, String signature,
113113
if (!outCopySignature.isEmpty()) {
114114
InfoTree copierTree = InfoTreeGenerator.generateDependencyTree(env,
115115
outCopySignature, idMap, generators);
116-
copier = Ops.rich(env.opFromInfoChain(copierTree, COMPUTER_NIL,
116+
copier = Ops.rich(env.opFromInfoTree(copierTree, COMPUTER_NIL,
117117
dependencyHints));
118118
}
119119

@@ -125,12 +125,12 @@ public InfoTree generate(OpEnvironment env, String signature,
125125
ConvertedOpInfo.ORIGINAL_INFO + ")");
126126
String originalSignature = originalComponent.substring(
127127
ConvertedOpInfo.ORIGINAL_INFO.length());
128-
InfoTree originalChain = InfoTreeGenerator.generateDependencyTree(env,
128+
InfoTree originalTree = InfoTreeGenerator.generateDependencyTree(env,
129129
originalSignature, idMap, generators);
130130

131-
OpInfo baseInfo = new ConvertedOpInfo(originalChain.info(), preconverters,
131+
OpInfo baseInfo = new ConvertedOpInfo(originalTree.info(), preconverters,
132132
postconverter, copier, env);
133-
return new InfoTree(baseInfo, originalChain.dependencies());
133+
return new InfoTree(baseInfo, originalTree.dependencies());
134134
}
135135

136136
private List<String> parseComponents(String signature) {

‎scijava-ops-engine/src/test/java/org/scijava/ops/engine/InfoTreeTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,19 +82,19 @@ public static void additionalSetup() {
8282
public final Producer<String> foo = () -> S;
8383

8484
@Test
85-
public void testInfoChainInstantiation() {
85+
public void testInfoTreeInstantiation() {
8686
Nil<Producer<String>> nil = new Nil<>() {};
87-
Producer<String> op = ops.opFromInfoChain(simpleTree, nil);
87+
Producer<String> op = ops.opFromInfoTree(simpleTree, nil);
8888
Assertions.assertEquals(S, op.create());
8989

9090
// Find dependency
9191
nil = new Nil<>() {};
92-
op = ops.opFromInfoChain(complexTree, nil);
92+
op = ops.opFromInfoTree(complexTree, nil);
9393
Assertions.assertEquals(S, op.create());
9494
}
9595

9696
@Test
97-
public void testInfoChainToString() {
97+
public void testInfoTreeToString() {
9898
Assertions.assertEquals( //
9999
simpleTree.info().implementationName(), //
100100
simpleTree.toString() //

‎scijava-ops-engine/src/test/java/org/scijava/ops/engine/impl/ProvenanceTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -172,19 +172,19 @@ public void testPriorityProvenance() {
172172
List<RichOp<?>> history2 = ops.history().executionsUpon(out2);
173173

174174
Assertions.assertEquals(1, history1.size());
175-
InfoTree opExecutionChain = Ops.infoTree(history1.get(0));
176-
Assertions.assertEquals(0, opExecutionChain.dependencies().size());
175+
InfoTree opExecutionTree = Ops.infoTree(history1.get(0));
176+
Assertions.assertEquals(0, opExecutionTree.dependencies().size());
177177
String expected =
178178
"public final java.util.function.Function org.scijava.ops.engine.impl.ProvenanceTest.baz";
179-
Assertions.assertEquals(expected, opExecutionChain.info()
179+
Assertions.assertEquals(expected, opExecutionTree.info()
180180
.getAnnotationBearer().toString());
181181

182182
Assertions.assertEquals(1, history2.size());
183-
opExecutionChain = Ops.infoTree(history2.get(0));
184-
Assertions.assertEquals(0, opExecutionChain.dependencies().size());
183+
opExecutionTree = Ops.infoTree(history2.get(0));
184+
Assertions.assertEquals(0, opExecutionTree.dependencies().size());
185185
expected =
186186
"public final java.util.function.Function org.scijava.ops.engine.impl.ProvenanceTest.bar";
187-
Assertions.assertEquals(expected, opExecutionChain.info()
187+
Assertions.assertEquals(expected, opExecutionTree.info()
188188
.getAnnotationBearer().toString());
189189
}
190190

0 commit comments

Comments
 (0)