1212 *
1313 * Manages a collection of processes that can be run in steps or continuously.
1414 *
15- * @author Even Solbraa
16- * @version $Id: $Id
15+ *
1716 */
1817public class ProcessModel implements Runnable {
18+
1919 static Logger logger = LogManager .getLogger (ProcessModel .class );
2020 private Map <String , ProcessSystem > processes = new LinkedHashMap <>();
2121
2222 private boolean runStep = false ;
2323 private int maxIterations = 50 ;
24- private int iterations = 0 ;
2524
2625 /**
2726 * Checks if the model is running in step mode.
28- *
29- * @return true if running in step mode, false otherwise.
3027 */
3128 public boolean isRunStep () {
3229 return runStep ;
3330 }
3431
3532 /**
3633 * Sets the step mode for the process.
37- *
38- * @param runStep true to enable step mode, false to disable.
3934 */
4035 public void setRunStep (boolean runStep ) {
4136 this .runStep = runStep ;
4237 }
4338
4439 /**
4540 * Adds a process to the model.
46- *
47- * @param name the name of the process.
48- * @param process the process to add.
49- * @return true if the process was added successfully.
5041 */
5142 public boolean add (String name , ProcessSystem process ) {
5243 if (name == null || name .isEmpty ()) {
@@ -65,55 +56,72 @@ public boolean add(String name, ProcessSystem process) {
6556
6657 /**
6758 * Retrieves a process by its name.
68- *
69- * @param name the name of the process.
70- * @return the corresponding process, or null if not found.
7159 */
7260 public ProcessSystem get (String name ) {
7361 return processes .get (name );
7462 }
7563
7664 /**
7765 * Removes a process by its name.
78- *
79- * @param name the name of the process to remove.
80- * @return true if the process was removed, false otherwise.
8166 */
8267 public boolean remove (String name ) {
8368 return processes .remove (name ) != null ;
8469 }
8570
8671 /**
87- * Executes all processes, either continuously or in steps based on mode.
72+ * The core run method.
73+ *
74+ * - If runStep == true, each process is run in "step" mode exactly once. - Otherwise (continuous
75+ * mode), it loops up to maxIterations or until all processes are finished (isFinished() == true).
8876 */
8977 @ Override
9078 public void run () {
91- for (ProcessSystem process : processes .values ()) {
92- try {
93- if (runStep ) {
79+ if (runStep ) {
80+ // Step mode: just run each process once in step mode
81+ for (ProcessSystem process : processes .values ()) {
82+ try {
83+ if (Thread .currentThread ().isInterrupted ()) {
84+ logger .debug ("Thread was interrupted, exiting run()..." );
85+ return ;
86+ }
9487 process .run_step ();
95- } else {
96- process .run ();
88+ } catch (Exception e ) {
89+ System .err .println ("Error running process step: " + e .getMessage ());
90+ e .printStackTrace ();
9791 }
98- } catch (Exception e ) {
99- System .err .println ("Error running process: " + e .getMessage ());
100- e .printStackTrace ();
10192 }
102- }
103- if (!runStep ) {
104- if (!isFinished () && iterations < maxIterations ) {
105- iterations += 1 ;
106- run ();
107- } else {
108- iterations = 0 ;
93+ } else {
94+ int iterations = 0 ;
95+ while (!Thread .currentThread ().isInterrupted () && !isFinished ()
96+ && iterations < maxIterations ) {
97+ for (ProcessSystem process : processes .values ()) {
98+ if (Thread .currentThread ().isInterrupted ()) {
99+ logger .debug ("Thread was interrupted, exiting run()..." );
100+ return ;
101+ }
102+ try {
103+ process .run (); // the process's continuous run
104+ } catch (Exception e ) {
105+ System .err .println ("Error running process: " + e .getMessage ());
106+ e .printStackTrace ();
107+ }
108+ }
109+ iterations ++;
109110 }
110111 }
111112 }
112113
114+ /**
115+ * Starts this model in a new thread and returns that thread.
116+ */
117+ public Thread runAsThread () {
118+ Thread processThread = new Thread (this );
119+ processThread .start ();
120+ return processThread ;
121+ }
122+
113123 /**
114124 * Checks if all processes are finished.
115- *
116- * @return true if all processes are solved, false otherwise.
117125 */
118126 public boolean isFinished () {
119127 for (ProcessSystem process : processes .values ()) {
@@ -125,11 +133,15 @@ public boolean isFinished() {
125133 }
126134
127135 /**
128- * Executes all processes in a single step.
136+ * Runs all processes in a single step (used outside of the thread model) .
129137 */
130138 public void runStep () {
131139 for (ProcessSystem process : processes .values ()) {
132140 try {
141+ if (Thread .currentThread ().isInterrupted ()) {
142+ logger .debug ("Thread was interrupted, exiting run()..." );
143+ return ;
144+ }
133145 process .run_step ();
134146 } catch (Exception e ) {
135147 System .err .println ("Error in runStep: " + e .getMessage ());
@@ -139,20 +151,19 @@ public void runStep() {
139151 }
140152
141153 /**
142- * Runs the model as a separate thread .
154+ * (Optional) Creates separate threads for each process (if you need them) .
143155 */
144156 public Map <String , Thread > getThreads () {
145157 Map <String , Thread > threads = new LinkedHashMap <>();
146158 try {
147159 for (ProcessSystem process : processes .values ()) {
148160 Thread thread = new Thread (process );
161+ thread .setName (process .getName () + " thread" );
149162 threads .put (process .getName (), thread );
150163 }
151-
152164 } catch (Exception ex ) {
153165 logger .debug (ex .getMessage (), ex );
154166 }
155167 return threads ;
156168 }
157-
158169}
0 commit comments