diff --git a/core/src/main/java/org/lflang/analyses/evm/Instruction.java b/core/src/main/java/org/lflang/analyses/evm/Instruction.java index ae82218d62..4fbfeaf295 100644 --- a/core/src/main/java/org/lflang/analyses/evm/Instruction.java +++ b/core/src/main/java/org/lflang/analyses/evm/Instruction.java @@ -1,6 +1,6 @@ package org.lflang.analyses.evm; -abstract public class Instruction { +public abstract class Instruction { /** VM Instruction Set */ public enum Opcode { diff --git a/core/src/main/java/org/lflang/analyses/evm/InstructionDU.java b/core/src/main/java/org/lflang/analyses/evm/InstructionDU.java index f534785807..75854e1c9b 100644 --- a/core/src/main/java/org/lflang/analyses/evm/InstructionDU.java +++ b/core/src/main/java/org/lflang/analyses/evm/InstructionDU.java @@ -10,7 +10,7 @@ public class InstructionDU extends Instruction { public InstructionDU(TimeValue releaseTime) { this.opcode = Opcode.DU; this.releaseTime = releaseTime; - } + } @Override public String toString() { diff --git a/core/src/main/java/org/lflang/analyses/evm/InstructionGenerator.java b/core/src/main/java/org/lflang/analyses/evm/InstructionGenerator.java index 1942c366d8..ceb34e726e 100644 --- a/core/src/main/java/org/lflang/analyses/evm/InstructionGenerator.java +++ b/core/src/main/java/org/lflang/analyses/evm/InstructionGenerator.java @@ -6,7 +6,6 @@ import java.util.List; import java.util.Map; import java.util.Queue; - import org.lflang.TargetConfig; import org.lflang.analyses.dag.Dag; import org.lflang.analyses.dag.DagEdge; @@ -76,11 +75,10 @@ public void generate() { System.out.println("Current: " + current); // Get the upstream nodes. - List upstreamReactionNodes = dag.dagEdgesRev - .getOrDefault(current, new HashMap<>()) - .keySet().stream() - .filter(n -> n.nodeType == dagNodeType.REACTION) - .toList(); + List upstreamReactionNodes = + dag.dagEdgesRev.getOrDefault(current, new HashMap<>()).keySet().stream() + .filter(n -> n.nodeType == dagNodeType.REACTION) + .toList(); System.out.println("Upstream: " + upstreamReactionNodes); /* Generate instructions for the current node */ @@ -101,25 +99,21 @@ public void generate() { for (DagNode n : upstreamReactionNodes) { int upstreamOwner = n.getWorker(); if (upstreamOwner != current.getWorker()) { - instructions.get(current.getWorker()).add( - new InstructionWU( - upstreamOwner, - n.nodeReaction - )); + instructions + .get(current.getWorker()) + .add(new InstructionWU(upstreamOwner, n.nodeReaction)); } } instructions.get(current.getWorker()).add(new InstructionEIT(reaction)); instructions.get(current.getWorker()).add(new InstructionINC2()); } - } - else if (current.nodeType == dagNodeType.SYNC) { + } else if (current.nodeType == dagNodeType.SYNC) { if (current != dag.head && current != dag.tail) { for (DagNode n : upstreamReactionNodes) { instructions.get(n.getWorker()).add(new InstructionDU(current.timeStep)); } - } - else if (current == dag.tail) { + } else if (current == dag.tail) { for (var schedule : instructions) { schedule.add(new InstructionSAC()); schedule.add(new InstructionDU(current.timeStep)); diff --git a/core/src/main/java/org/lflang/analyses/evm/InstructionWU.java b/core/src/main/java/org/lflang/analyses/evm/InstructionWU.java index 77a6e6bf37..282eddfedd 100644 --- a/core/src/main/java/org/lflang/analyses/evm/InstructionWU.java +++ b/core/src/main/java/org/lflang/analyses/evm/InstructionWU.java @@ -14,7 +14,7 @@ public InstructionWU(int worker, ReactionInstance reaction) { this.opcode = Opcode.WU; this.worker = worker; this.reaction = reaction; - } + } @Override public String toString() { diff --git a/core/src/main/java/org/lflang/generator/c/CStaticScheduleGenerator.java b/core/src/main/java/org/lflang/generator/c/CStaticScheduleGenerator.java index 25e62ed5e0..130bc9994e 100644 --- a/core/src/main/java/org/lflang/generator/c/CStaticScheduleGenerator.java +++ b/core/src/main/java/org/lflang/generator/c/CStaticScheduleGenerator.java @@ -115,8 +115,7 @@ public StaticScheduler createStaticScheduler(Dag dag) { /** Generate VM instructions for each DAG partition. */ public void generateInstructionsFromPartitions(Dag dagParitioned) { - InstructionGenerator instGen = - new InstructionGenerator(dagParitioned, this.targetConfig); + InstructionGenerator instGen = new InstructionGenerator(dagParitioned, this.targetConfig); instGen.generate(); instGen.display();