Update ratio-lib to version 0.0.19 and add new solver methods for enh…

…anced functionality
ratioSolver · Jan 15, 2025 · 4c87de8 · 4c87de8
1 parent c8c5e87
commit 4c87de8
Show file tree

Hide file tree

Showing 9 changed files with 343 additions and 55 deletions.
diff --git a/extern/riddle b/extern/riddle
diff --git a/gui/app/package-lock.json b/gui/app/package-lock.json
diff --git a/gui/app/package.json b/gui/app/package.json
@@ -13,6 +13,6 @@
     "vite": "^6.0.5"
   },
   "dependencies": {
-    "ratio-lib": "^0.0.17"
+    "ratio-lib": "^0.0.19"
   }
 }
diff --git a/gui/lib/package-lock.json b/gui/lib/package-lock.json
diff --git a/gui/lib/package.json b/gui/lib/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ratio-lib",
-  "version": "0.0.18",
+  "version": "0.0.19",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/gui/lib/src/solver/solver.ts b/gui/lib/src/solver/solver.ts
diff --git a/gui/lib/src/solver/solver_components.ts b/gui/lib/src/solver/solver_components.ts
@@ -17,10 +17,20 @@ export class SolverAnchor extends AnchorComponent<solver.Solver> implements solv
 
   state_changed(state: solver.SolverState): void { this.render(); }
   flaw_created(flaw: solver.graph.Flaw): void { }
+  flaw_state_changed(flaw: solver.graph.Flaw): void { }
   flaw_cost_changed(flaw: solver.graph.Flaw): void { }
   current_flaw(flaw: solver.graph.Flaw | null): void { }
   resolver_created(resolver: solver.graph.Resolver): void { }
+  resolver_state_changed(resolver: solver.graph.Resolver): void { }
   current_resolver(resolver: solver.graph.Resolver | null): void { }
+  causal_link_added(flaw: solver.graph.Flaw, resolver: solver.graph.Resolver): void { }
+
+  execution_state_changed(state: solver.SolverState): void { }
+  tick(time: solver.values.Rational): void { }
+  starting(atoms: solver.values.Atom[]): void { }
+  start(atoms: solver.values.Atom[]): void { }
+  ending(atoms: solver.values.Atom[]): void { }
+  end(atoms: solver.values.Atom[]): void { }
 
   private render(): void {
     this.element.innerHTML = to_icon(this.payload.get_state()) + ' ' + this.payload.get_name();

diff --git a/gui/lib/src/solver/solver_graph.ts b/gui/lib/src/solver/solver_graph.ts
@@ -104,6 +104,11 @@ export class SolverGraph extends Component<solver.Solver, HTMLDivElement> implem
     this.cy.layout(this.layout).run();
   }
 
+  flaw_state_changed(flaw: solver.graph.Flaw): void {
+    this.cy.$id(flaw.get_id().toString()).data('color', color(flaw));
+    this.cy.layout(this.layout).run();
+  }
+
   flaw_cost_changed(flaw: solver.graph.Flaw): void {
     this.cy.$id(flaw.get_id().toString()).data('color', color(flaw));
     this.cy.layout(this.layout).run();
@@ -126,6 +131,11 @@ export class SolverGraph extends Component<solver.Solver, HTMLDivElement> implem
     this.cy.layout(this.layout).run();
   }
 
+  resolver_state_changed(resolver: solver.graph.Resolver): void {
+    this.cy.$id(resolver.get_id().toString()).data('color', color(resolver));
+    this.cy.layout(this.layout).run();
+  }
+
   current_resolver(resolver: solver.graph.Resolver | null): void {
     if (this.c_resolver)
       this.cy.$id(this.c_resolver.get_id().toString()).removeClass('current');
@@ -136,6 +146,18 @@ export class SolverGraph extends Component<solver.Solver, HTMLDivElement> implem
     this.cy.layout(this.layout).run();
   }
 
+  causal_link_added(flaw: solver.graph.Flaw, resolver: solver.graph.Resolver): void {
+    this.cy.add({ group: 'edges', data: { id: `${flaw.get_id()}-${resolver.get_id()}`, source: flaw.get_id(), target: resolver.get_id(), stroke: stroke_style(resolver) } });
+    this.cy.layout(this.layout).run();
+  }
+
+  execution_state_changed(state: solver.SolverState): void { }
+  tick(time: solver.values.Rational): void { }
+  starting(atoms: solver.values.Atom[]): void { }
+  start(atoms: solver.values.Atom[]): void { }
+  ending(atoms: solver.values.Atom[]): void { }
+  end(atoms: solver.values.Atom[]): void { }
+
   unmounting(): void { this.payload.remove_solver_listener(this); }
 
   private create_flaw_node(flaw: solver.graph.Flaw): cytoscape.CollectionReturnValue {

diff --git a/gui/lib/src/solver/solver_timelines.ts b/gui/lib/src/solver/solver_timelines.ts
@@ -37,9 +37,19 @@ export class TimelinesChart extends Component<solver.Solver, HTMLDivElement> imp
   state_changed(state: solver.SolverState): void { }
   flaw_created(flaw: solver.graph.Flaw): void { }
   flaw_cost_changed(flaw: solver.graph.Flaw): void { }
+  flaw_state_changed(flaw: solver.graph.Flaw): void { }
   current_flaw(flaw: solver.graph.Flaw | null): void { }
   resolver_created(resolver: solver.graph.Resolver): void { }
+  resolver_state_changed(resolver: solver.graph.Resolver): void { }
   current_resolver(resolver: solver.graph.Resolver | null): void { }
+  causal_link_added(flaw: solver.graph.Flaw, resolver: solver.graph.Resolver): void { }
+
+  execution_state_changed(state: solver.SolverState): void { }
+  tick(time: solver.values.Rational): void { }
+  starting(atoms: solver.values.Atom[]): void { }
+  start(atoms: solver.values.Atom[]): void { }
+  ending(atoms: solver.values.Atom[]): void { }
+  end(atoms: solver.values.Atom[]): void { }
 
   unmounting(): void { this.payload.remove_solver_listener(this); }
 }
+7 −6		include/core.hpp
+3 −0		include/env.hpp
+0 −1		include/item.hpp
+2 −7		src/core.cpp
+16 −0		src/env.cpp
+14 −25		src/item.cpp
+1 −1		tests/test_parser.cpp