minor cleanings..

ratioSolver · Sep 18, 2022 · 3e9acd0 · 3e9acd0
1 parent 4174354
commit 3e9acd0
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 8 deletions.
diff --git a/src/main/java/it/cnr/istc/pst/oratio/ExecutorListener.java b/src/main/java/it/cnr/istc/pst/oratio/ExecutorListener.java
@@ -4,11 +4,11 @@ public interface ExecutorListener {
 
     public void tick(final Rational current_time);
 
-    public void startingAtoms(final long[] atoms);
+    public void startingAtoms(final Atom[] atoms);
 
-    public void startAtoms(final long[] atoms);
+    public void startAtoms(final Atom[] atoms);
 
-    public void endingAtoms(final long[] atoms);
+    public void endingAtoms(final Atom[] atoms);
 
-    public void endAtoms(final long[] atoms);
+    public void endAtoms(final Atom[] atoms);
 }
diff --git a/src/main/java/it/cnr/istc/pst/oratio/Item.java b/src/main/java/it/cnr/istc/pst/oratio/Item.java
@@ -13,6 +13,11 @@ public class Item implements Env {
     private String name; // a mnemonic name..
 
     Item(final Solver solver, final Type type, final long id) {
+        if (!type.isPrimitive())
+            if (this instanceof Atom)
+                solver.atoms.put(id, (Atom) this);
+            else
+                solver.items.put(id, this);
         this.solver = solver;
         this.type = type;
         this.id = id;

diff --git a/src/main/java/it/cnr/istc/pst/oratio/Solver.java b/src/main/java/it/cnr/istc/pst/oratio/Solver.java
@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Objects;
@@ -45,6 +46,8 @@ public class Solver implements Scope, Env {
     final Map<String, Type> types = new LinkedHashMap<>();
     final Map<String, Predicate> predicates = new LinkedHashMap<>();
     final Map<String, Item> exprs = new LinkedHashMap<>();
+    final Map<Long, Item> items = new HashMap<>();
+    final Map<Long, Atom> atoms = new HashMap<>();
     private final TimelinesList timelines;
     private final boolean build_timelines_at_state_change;
     private final boolean build_timelines_at_solution_found;

diff --git a/src/main/java/it/cnr/istc/pst/oratio/TimelinesExecutor.java b/src/main/java/it/cnr/istc/pst/oratio/TimelinesExecutor.java
@@ -86,19 +86,31 @@ private void fireTick(final long current_time_num, final long current_time_den)
     }
 
     private void fireStartingAtoms(final long[] atoms) {
-        executor_listeners.stream().forEach(l -> l.startingAtoms(atoms));
+        Atom[] c_atoms = new Atom[atoms.length];
+        for (int i = 0; i < c_atoms.length; i++)
+            c_atoms[i] = solver.atoms.get(atoms[i]);
+        executor_listeners.stream().forEach(l -> l.startingAtoms(c_atoms));
     }
 
     private void fireStartAtoms(final long[] atoms) {
-        executor_listeners.stream().forEach(l -> l.startAtoms(atoms));
+        Atom[] c_atoms = new Atom[atoms.length];
+        for (int i = 0; i < c_atoms.length; i++)
+            c_atoms[i] = solver.atoms.get(atoms[i]);
+        executor_listeners.stream().forEach(l -> l.startAtoms(c_atoms));
     }
 
     private void fireEndingAtoms(final long[] atoms) {
-        executor_listeners.stream().forEach(l -> l.endingAtoms(atoms));
+        Atom[] c_atoms = new Atom[atoms.length];
+        for (int i = 0; i < c_atoms.length; i++)
+            c_atoms[i] = solver.atoms.get(atoms[i]);
+        executor_listeners.stream().forEach(l -> l.endingAtoms(c_atoms));
     }
 
     private void fireEndAtoms(final long[] atoms) {
-        executor_listeners.stream().forEach(l -> l.endAtoms(atoms));
+        Atom[] c_atoms = new Atom[atoms.length];
+        for (int i = 0; i < c_atoms.length; i++)
+            c_atoms[i] = solver.atoms.get(atoms[i]);
+        executor_listeners.stream().forEach(l -> l.endAtoms(c_atoms));
     }
 
     public void addExecutorListener(final ExecutorListener l) {

diff --git a/src/test/java/it/istc/pst/oratio/SolverTests.java b/src/test/java/it/istc/pst/oratio/SolverTests.java
@@ -1,8 +1,13 @@
 package it.istc.pst.oratio;
 
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import org.junit.jupiter.api.Test;
 
+import it.cnr.istc.pst.oratio.Item.ArithItem;
+import it.cnr.istc.pst.oratio.Rational;
 import it.cnr.istc.pst.oratio.Solver;
+import it.cnr.istc.pst.oratio.SolverException;
 import it.cnr.istc.pst.oratio.TimelinesExecutor;
 
 public class SolverTests {
@@ -13,6 +18,20 @@ void testSolverCreation() {
         slv.dispose();
     }
 
+    @Test
+    void testSimpleProblem() {
+        Solver slv = new Solver();
+        try {
+            slv.read("real a; a >= 10.0;");
+            slv.solve();
+            ArithItem a = (ArithItem) slv.get("a");
+            assertTrue(a.getValue().eq(new Rational(10)));
+        } catch (SolverException | NoSuchFieldException e) {
+            e.printStackTrace();
+        }
+        slv.dispose();
+    }
+
     @Test
     void testExecutorCreation() {
         Solver slv = new Solver();