Skip to content

Commit af5c3d6

Browse files
Jim review modifications II
fixed missed compiler errors, and remove bad comment
1 parent b962405 commit af5c3d6

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

vcell-cli/src/main/java/org/vcell/cli/run/results/SpatialResultsConverter.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,9 @@ private static ValueHolder<LazySBMLSpatialDataAccessor> getSpatialValueHolderFor
188188
// get the list of variables associated with the data reference
189189
for (Variable var : dataGen.getVariables()) {
190190
// for each variable we recover the task
191-
Task baseTask = sedml.findBaseTaskByAbstractTaskId(var.getTaskReference());
191+
AbstractTask topLevelTask = sedml.findAbstractTaskById(var.getTaskReference());
192+
if (null == topLevelTask) throw new RuntimeException("Task referenced by variable could not be found!");
193+
Task baseTask = sedml.findBaseTaskByAbstractTaskId(topLevelTask.getId());
192194
if (baseTask == null) throw new RuntimeException("Unable to find task referenced by var: " + var.getId().string());
193195

194196
// from the task we get the sbml model

vcell-core/src/main/java/org/vcell/sedml/SedMLImporter.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,6 @@ private SedMLDataContainer verifyOrModifyOrRejectSedml(SedMLDataContainer provid
322322
Queue<RepeatedTask> badRepeatedTasks = repeatedTasks.stream().filter((task)->task.getSubTasks().size() > 1).collect(Collectors.toCollection(LinkedList::new));
323323
if (!badRepeatedTasks.isEmpty()){
324324
// Uh-oh, multi-subTasks detected!
325-
// Short circuit here matters; if `condenseRedundantSubTasks == true`, then we can modify the sedml, and safely call the method to do so
326325
if (policy.multipleSubTaskPolicy != StrictnessPolicy.MultipleSubTaskPolicy.REJECT_IMMEDIATELY){
327326
while (!badRepeatedTasks.isEmpty()){
328327
boolean success = this.successfullyReducedRedundantSubTasks(badRepeatedTasks.poll());

0 commit comments

Comments
 (0)