bump good_lp and bug fix

Author: Specy

Cargo.toml

@@ -7,7 +7,7 @@ documentation = "https://rooc.specy.app/docs/rooc"
 description = "A mixed integer linear programming modeling language to solve linear optimization models. Extensible, works in WASM and easy to use."
 keywords = ["optimization", "milp", "solver", "mathematics", "linear-programming"]
 categories = ["mathematics", "algorithms", "science"]
-version = "0.1.18"
+version = "0.1.19"
 license = "GPL-3.0"
 edition = "2021"
 
@@ -23,9 +23,10 @@ pest_derive = { version = "2.7.14", features = ["grammar-extras"] }
 lazy_static = "1.5.0"
 copper = "0.1.0"
 indexmap = { version = "2.6.0", features = ["serde"] }
-good_lp = { version = "1.12.0", features = ["clarabel-wasm"], default-features = false }
+good_lp = { version = "1.13.0", features = ["clarabel"], default-features = false }
 microlp = "0.2.11"
 log = "0.4.21"
+utf8_slice = "1.0.0"
 
 [target.'cfg(target_family = "wasm")'.dev-dependencies]
 wasm-bindgen-test = "0.3.0"

src/main.rs

@@ -9,22 +9,20 @@ use rooc::pipe::{StepByStepSimplexPipe, TableauPipe};
 #[allow(unused)]
 fn main() {
     let source = r#"
-/*
-    Example model, look at the docs 
-    for more info https://rooc.specy.app/docs/rooc
-*/
-max x
+
+max 2x_1 + x_2 - x_3
 subject to
-    //write the constraints here
-    x <= y
-where 
-    // write the constants here
-    let y = 10
-    let list = [2,4,6]
-define 
-    // define the model's variables here
-    x as NonNegativeReal
-    z_i as NonNegativeReal for i in list
+//write the constraints here
+5x_1 - 2x_2 + 8x_3 ≤ 15
+8x_1+3x_2 -x_3 ≥ 9
+x_1+x_2+x_3≤6
+where
+
+define
+// define the model's variables here
+x_1 as Real
+x_2 as Real
+x_3 as Real
     "#
     .to_string();
     let pipe_runner = PipeRunner::new(vec![

src/parser/grammar.pest

@@ -5,12 +5,12 @@ problem = {
     #constraints = constraint_list ~
     (
     	nl+ ~
-    	^"where" ~ nl+ ~
+    	^"where" ~
     	#where = consts_declaration
     )? ~
     (
     	nl+ ~
-    	^"define" ~ nl+ ~
+    	^"define" ~
     	#define = domains_declaration
     )? ~
     nl* ~
@@ -37,19 +37,19 @@ constraint = {
 constraint_name = {
     variable ~ ":" ~ nl*
 }
-	
-    
+
+
 
 // constants declaration
-consts_declaration = { (const_declaration ~(nl* ~ const_declaration)*)? }
+consts_declaration = { (nl+ ~ const_declaration)* }
 const_declaration  = {
   "let" ~
   #name = (simple_variable | "_") ~
   "=" ~
   #value = tagged_exp
 }
 
-domains_declaration = { (domain_declaration ~ (nl* ~domain_declaration)*)? }
+domains_declaration = { (nl+ ~domain_declaration)* }
 domain_declaration = {
   #vars = domain_variables ~ nl*~
   ^"as" ~

src/pipe/pipe_wasm_runner.rs

@@ -59,7 +59,7 @@ impl Pipeable for JsPipable {
     fn pipe(
         &self,
         data: &mut PipeableData,
-        pipe_context: &PipeContext,
+        _pipe_context: &PipeContext,
     ) -> Result<PipeableData, PipeError> {
         let js_pipable = match data {
             PipeableData::String(s) => JsPipableData::String(s.clone()),
@@ -74,7 +74,7 @@ impl Pipeable for JsPipable {
         };
         let js_pipable =
             serialize_json_compatible(&js_pipable).map_err(|e| PipeError::Other(e.to_string()))?;
-        let mut js_args = js_sys::Array::new();
+        let js_args = js_sys::Array::new();
         js_args.push(&js_pipable);
         let result = self.function.apply(&JsValue::NULL, &js_args).map_err(|e| {
             PipeError::Other(

src/solvers/simplex/optimal_tableau.rs

@@ -3,7 +3,7 @@ use crate::prelude::*;
 use crate::solvers::{LpSolution, Tableau};
 use core::fmt;
 use indexmap::IndexMap;
-use std::fmt::{write, Display};
+use std::fmt::{Display};
 
 #[derive(Debug, Clone)]
 #[cfg_attr(target_arch = "wasm32", wasm_bindgen)]

src/utils.rs

@@ -65,17 +65,19 @@ impl InputSpan {
     /// * `Ok(&str)` - The extracted text slice if the span is valid
     /// * `Err(String)` - Error message if the span is out of bounds
     pub fn span_text<'a>(&self, text: &'a str) -> Result<&'a str, String> {
+        let indices = text.char_indices();
         let end = (self.start + self.len) as usize;
         let start = self.start as usize;
-        if start > text.len() || end > text.len() {
+        let len = text.chars().count();
+        if start > len || end > len {
             return Err(format!(
                 "Span out of bounds: {}..{} (text len: {})",
                 start,
                 end,
                 text.len()
             ));
         }
-        Ok(&text[start..end])
+        Ok(utf8_slice::slice(text, start, end))
     }
 }
 

tests/parser_tests.rs

@@ -117,6 +117,57 @@ define
             .expect("Failed to type check problem");
     }
 
+    #[test]
+    #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)]
+    fn empty_where() {
+        let input = "
+            min 1
+            s.t.
+                1 <= 1
+            where
+            ";
+        RoocParser::new(input.to_string())
+            .parse_and_transform(vec![], &IndexMap::new())
+            .expect("Failed to parse and transform problem");
+        RoocParser::new(input.to_string())
+            .type_check(&vec![], &IndexMap::new())
+            .expect("Failed to type check problem");
+    }
+    #[test]
+    #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)]
+    fn empty_define() {
+        let input = "
+            min 1
+            s.t.
+                1 <= 1
+            define
+            ";
+        RoocParser::new(input.to_string())
+            .parse_and_transform(vec![], &IndexMap::new())
+            .expect("Failed to parse and transform problem");
+        RoocParser::new(input.to_string())
+            .type_check(&vec![], &IndexMap::new())
+            .expect("Failed to type check problem");
+    }
+
+    #[test]
+    #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)]
+    fn empty_where_define() {
+        let input = "
+            min 1
+            s.t.
+                1 <= 1
+            where
+            define
+            ";
+        RoocParser::new(input.to_string())
+            .parse_and_transform(vec![], &IndexMap::new())
+            .expect("Failed to parse and transform problem");
+        RoocParser::new(input.to_string())
+            .type_check(&vec![], &IndexMap::new())
+            .expect("Failed to type check problem");
+    }
+
     #[test]
     #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)]
     fn test_parser_variants4() {
@@ -134,6 +185,7 @@ define
                 max {1, 2, 3} >= 1
             where
                 let A = [1, 2, 3, 4]
+            define
             ";
         RoocParser::new(input.to_string())
             .parse_and_transform(vec![], &IndexMap::new())
@@ -185,6 +237,7 @@ define
             |x + y|z + 2 >= 1
 
             2(x + y)3|x + y|z + 2 >= 1
+        where
         define
             x,y,z as Real
         ";
@@ -252,7 +305,8 @@ define
             s.t.
              S >= 1
             where
-                let S = \"Hello\"
+                let S = \"Hello\"\
+            define
             ";
         RoocParser::new(input.to_string())
             .parse_and_transform(vec![], &IndexMap::new())
@@ -276,6 +330,7 @@ define
                 [0,1,0],
                 [0,0,1]
             ]
+        define
         ";
         RoocParser::new(input.to_string())
             .parse_and_transform(vec![], &IndexMap::new())
@@ -314,6 +369,31 @@ define
             .expect("Failed to type check problem");
     }
 
+    #[test]
+    #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)]
+    fn non_utf8() {
+        let input = "
+max 2x_1 + x_2 - x_3
+subject to
+//write the constraints here
+5x_1 - 2x_2 + 8x_3 ≤ 15
+8x_1+3x_2 -x_3 ≥ 9
+x_1+x_2+x_3≤6
+where
+
+define
+// define the model's variables here
+x_1 as Real
+x_2 as Real
+x_3 as Real
+        ";
+        
+        //i expect to get an error, and not panic
+        RoocParser::new(input.to_string())
+            .parse_and_transform(vec![], &IndexMap::new())
+            .expect_err("");
+    }
+
     #[test]
     #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)]
     fn test_const_decl_1() {

ts-lib/package.json

@@ -2,7 +2,7 @@
   "type": "module",
   "name": "@specy/rooc",
   "description": "Optimization modeling language",
-  "version": "1.5.6",
+  "version": "1.5.7",
   "license": "GPL-3.0",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",