parse-lp 3.0.2__tar.gz → 3.0.3__tar.gz

{parse_lp-3.0.2 → parse_lp-3.0.3}/Cargo.lock

@@ -11,6 +11,56 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "anstream"
+version = "0.6.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
+dependencies = [
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
+dependencies = [
+ "anstyle",
+ "once_cell_polyfill",
+ "windows-sys 0.61.2",
+]
+
 [[package]]
 name = "ascii-canvas"
 version = "4.0.0"
@@ -90,6 +140,52 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 
+[[package]]
+name = "clap"
+version = "4.5.53"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9e340e012a1bf4935f5282ed1436d1489548e8f72308207ea5df0e23d2d03f8"
+dependencies = [
+ "clap_builder",
+ "clap_derive",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.5.53"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d76b5d13eaa18c901fd2f7fca939fefe3a0727a953561fefdf3b2922b8569d00"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex",
+ "strsim",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.5.49"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a0b5487afeab2deb2ff4e03a807ad1a03ac532ff5a2cee5d86884440c7f7671"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.111",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
+
+[[package]]
+name = "colorchoice"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
+
 [[package]]
 name = "console"
 version = "0.15.11"
@@ -302,6 +398,12 @@ dependencies = [
  "similar",
 ]
 
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695"
+
 [[package]]
 name = "itertools"
 version = "0.14.0"
@@ -368,12 +470,6 @@ dependencies = [
  "rustversion",
 ]
 
-[[package]]
-name = "lazy_static"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
-
 [[package]]
 name = "libc"
 version = "0.2.178"
@@ -403,24 +499,24 @@ checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
 
 [[package]]
 name = "logos"
-version = "0.15.1"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff472f899b4ec2d99161c51f60ff7075eeb3097069a36050d8037a6325eb8154"
+checksum = "a790d11254054e5dc83902dba85d253ff06ceb0cfafb12be8773435cb9dfb4f4"
 dependencies = [
  "logos-derive",
 ]
 
 [[package]]
 name = "logos-codegen"
-version = "0.15.1"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "192a3a2b90b0c05b27a0b2c43eecdb7c415e29243acc3f89cc8247a5b693045c"
+checksum = "f60337c43a38313b58871f8d5d76872b8e17aa9d51fad494b5e76092c0ce05f5"
 dependencies = [
  "beef",
  "fnv",
- "lazy_static",
  "proc-macro2",
  "quote",
+ "regex-automata",
  "regex-syntax",
  "rustc_version",
  "syn 2.0.111",
@@ -428,9 +524,9 @@ dependencies = [
 
 [[package]]
 name = "logos-derive"
-version = "0.15.1"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "605d9697bcd5ef3a42d38efc51541aa3d6a4a25f7ab6d1ed0da5ac632a26b470"
+checksum = "d151b2ae667f69e10b8738f5cac0c746faa22b2e15ea7e83b55476afec3767dc"
 dependencies = [
  "logos-codegen",
 ]
@@ -447,8 +543,9 @@ dependencies = [
 
 [[package]]
 name = "lp_parser_rs"
-version = "3.0.2"
+version = "3.0.3"
 dependencies = [
+ "clap",
  "csv",
  "diff-struct",
  "float_eq",
@@ -460,6 +557,7 @@ dependencies = [
  "lp-solvers",
  "serde",
  "serde_json",
+ "serde_yaml",
  "thiserror",
  "unique_id",
 ]
@@ -564,6 +662,12 @@ version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
+[[package]]
+name = "once_cell_polyfill"
+version = "1.70.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"
+
 [[package]]
 name = "parking_lot"
 version = "0.12.5"
@@ -589,7 +693,7 @@ dependencies = [
 
 [[package]]
 name = "parse_lp"
-version = "3.0.2"
+version = "3.0.3"
 dependencies = [
  "lp_parser_rs",
  "pyo3",
@@ -905,6 +1009,19 @@ dependencies = [
  "serde_core",
 ]
 
+[[package]]
+name = "serde_yaml"
+version = "0.9.34+deprecated"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
+dependencies = [
+ "indexmap",
+ "itoa",
+ "ryu",
+ "serde",
+ "unsafe-libyaml",
+]
+
 [[package]]
 name = "sha2"
 version = "0.10.9"
@@ -956,6 +1073,12 @@ dependencies = [
  "precomputed-hash",
 ]
 
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
 [[package]]
 name = "syn"
 version = "1.0.109"
@@ -1066,6 +1189,18 @@ dependencies = [
  "uuid",
 ]
 
+[[package]]
+name = "unsafe-libyaml"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
+
+[[package]]
+name = "utf8parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+
 [[package]]
 name = "uuid"
 version = "1.19.0"

{parse_lp-3.0.2 → parse_lp-3.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: parse_lp
-Version: 3.0.2
+Version: 3.0.3
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10

{parse_lp-3.0.2 → parse_lp-3.0.3}/python/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "parse_lp"
-version = "3.0.2"
+version = "3.0.3"
 edition = "2021"
 authors = ["Dan Dixey", "Dan Dixey <dan@functorml.co.uk>"]
 rust-version = "1.74.0"

{parse_lp-3.0.2 → parse_lp-3.0.3}/python/python/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [3.0.3](https://github.com/dandxy89/lp_parser_rs/compare/parse_lp-v3.0.2...parse_lp-v3.0.3) (2025-12-11)
+
+
+### Code Refactoring
+
+* Clippy ([#150](https://github.com/dandxy89/lp_parser_rs/issues/150)) ([0ec6a51](https://github.com/dandxy89/lp_parser_rs/commit/0ec6a510fe3bd3a9f6f52194de381a110ad19589))
+
 ## [3.0.2](https://github.com/dandxy89/lp_parser_rs/compare/parse_lp-v3.0.0...parse_lp-v3.0.2) (2025-12-07)
 
 

{parse_lp-3.0.2 → parse_lp-3.0.3}/python/src/lib.rs

@@ -1,3 +1,6 @@
+// Allow pedantic lints that are unavoidable due to PyO3 macro requirements
+#![allow(clippy::unnecessary_wraps, clippy::needless_pass_by_value, clippy::cast_possible_truncation, clippy::cast_possible_wrap)]
+
 use std::borrow::Cow;
 use std::path::{Path, PathBuf};
 
@@ -36,7 +39,7 @@ impl LpParser {
     #[pyo3(text_signature = "($self)")]
     fn parse(&mut self) -> PyResult<()> {
         let input = parse_file(&PathBuf::from(&self.lp_file)).map_err(|_| PyRuntimeError::new_err("Unable to read LpFile."))?;
-        self.parsed_content = Some(input.to_owned());
+        self.parsed_content = Some(input.clone());
         Ok(())
     }
 

{parse_lp-3.0.2 → parse_lp-3.0.3}/rust/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "lp_parser_rs"
-version = "3.0.2"
+version = "3.0.3"
 edition = "2021"
 authors = ["Dan Dixey", "Dan Dixey <dan@functorml.co.uk>"]
 rust-version = "1.70.0"
@@ -26,16 +26,19 @@ doctest = false
 
 [[bin]]
 name = "lp_parser"
-path = "src/bin/main.rs"
+path = "src/bin/lp_parser/main.rs"
 
 [dependencies]
+clap = { version = "4.5", features = ["derive"] }
 csv = { version = "1.4.0", optional = true }
 diff-struct = { version = "0.5.3", optional = true }
 lalrpop-util = "0.22.2"
 lp-solvers = { version = "1.1", optional = true }
 log = "0.4.29"
-logos = "0.15.1"
+logos = "0.16.0"
 serde = { version = "1.0.228", features = ["derive"], optional = true }
+serde_json = { version = "1.0", optional = true }
+serde_yaml = { version = "0.9", optional = true }
 thiserror = "2.0.17"
 unique_id = { version = "0.1.7", features = ["sequence"] }
 
@@ -52,7 +55,7 @@ csv = ["dep:csv"]
 default = []
 diff = ["dep:diff-struct", "serde"]
 lp-solvers = ["dep:lp-solvers"]
-serde = ["dep:serde"]
+serde = ["dep:serde", "dep:serde_json", "dep:serde_yaml"]
 test-cbc = ["lp-solvers"]
 
 [package.metadata.cargo-machete]

{parse_lp-3.0.2 → parse_lp-3.0.3}/rust/README.md

@@ -61,16 +61,6 @@ lp_parser_rs = "3.0.0" # x-release-please-version
 
 ### Basic Usage
 
-Clone and run with a sample file:
-
-```bash
-git clone https://github.com/dandxy89/lp_parser_rs.git
-# Parse a single LP file
-cargo run --bin lp_parser --release -- {{ /path/to/your/file.lp }}
-# Compare two LP files (enabling the 'diff' feature)
-cargo run --bin lp_parser --release --features diff -- {{ /path/to/your/file.lp }} {{ /path/to/your/other/file.lp }}
-```
-
 Using the library directly:
 
 ```rust
@@ -132,7 +122,98 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 lp_parser_rs = { version = "3.0.0", features = ["serde", "diff"] } # x-release-please-version
 ```
 
-### Solving with External Solvers (`lp-solvers` feature)
+## Command-Line Interface
+
+The `lp_parser` binary provides a comprehensive CLI for working with LP files.
+
+### Installation
+
+```bash
+# Install with all features
+cargo install lp_parser_rs --all-features
+
+# Or build from source
+git clone https://github.com/dandxy89/lp_parser_rs.git
+cd lp_parser_rs/rust
+cargo build --release --all-features
+```
+
+### Commands
+
+```
+lp_parser <COMMAND>
+
+Commands:
+  parse    Parse an LP file and display its structure
+  info     Show detailed statistics about an LP problem
+  diff     Compare two LP files (requires 'diff' feature)
+  convert  Convert LP file to another format
+  solve    Solve an LP problem using external solvers (requires 'lp-solvers' feature)
+
+Global Options:
+  -v, --verbose    Increase output verbosity
+  -q, --quiet      Suppress non-essential output
+  -h, --help       Print help
+  -V, --version    Print version
+```
+
+### Examples
+
+**Parse and display an LP file:**
+
+```bash
+lp_parser parse problem.lp
+```
+
+**Get problem statistics:**
+
+```bash
+lp_parser info problem.lp
+# With detailed listings
+lp_parser info problem.lp --variables --constraints --objectives
+```
+
+**Output as JSON or YAML:**
+
+```bash
+lp_parser info problem.lp --format json --pretty
+lp_parser parse problem.lp --format yaml -o problem.yaml
+```
+
+**Compare two LP files:**
+
+```bash
+lp_parser diff old_model.lp new_model.lp
+lp_parser diff old.lp new.lp --format json --pretty
+```
+
+**Convert between formats:**
+
+```bash
+# To LP (with formatting options)
+lp_parser convert problem.lp --format lp --precision 4 --compact
+
+# To CSV (creates constraints.csv, objectives.csv, variables.csv)
+lp_parser convert problem.lp --format csv --output ./output_dir
+
+# To JSON/YAML
+lp_parser convert problem.lp --format json --pretty -o problem.json
+lp_parser convert problem.lp --format yaml -o problem.yaml
+```
+
+**Solve with external solvers:**
+```bash
+# Using CBC (default)
+lp_parser solve problem.lp
+
+# Using GLPK
+lp_parser solve problem.lp --solver glpk
+
+# Output solution as JSON
+lp_parser solve problem.lp --format json --pretty
+```
+
+## Solving with External Solvers (`lp-solvers` feature)
 
 Enable the `lp-solvers` feature to solve parsed LP problems using external solvers like CBC, Gurobi, CPLEX, or GLPK via the [lp-solvers](https://crates.io/crates/lp-solvers) crate:
 

{parse_lp-3.0.2 → parse_lp-3.0.3}/rust/rust/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## [3.0.3](https://github.com/dandxy89/lp_parser_rs/compare/lp_parser_rs-v3.0.2...lp_parser_rs-v3.0.3) (2025-12-11)
+
+
+### Build System
+
+* Bump logos crate to 0.16.0 ([690e83c](https://github.com/dandxy89/lp_parser_rs/commit/690e83c69277a9de49bc8579c86db3a433766389))
+
+
+### Bug Fixes
+
+* Improvements to the binary / main ([#151](https://github.com/dandxy89/lp_parser_rs/issues/151)) ([0ca04b8](https://github.com/dandxy89/lp_parser_rs/commit/0ca04b81cce55c7fac0b04211a493997ec0892b2))
+
+
+### Code Refactoring
+
+* Clippy ([#150](https://github.com/dandxy89/lp_parser_rs/issues/150)) ([0ec6a51](https://github.com/dandxy89/lp_parser_rs/commit/0ec6a510fe3bd3a9f6f52194de381a110ad19589))
+
 ## [3.0.2](https://github.com/dandxy89/lp_parser_rs/compare/lp_parser_rs-v3.0.1...lp_parser_rs-v3.0.2) (2025-12-07)
 
 

parse_lp-3.0.3/rust/src/bin/lp_parser/cli.rs

@@ -0,0 +1,214 @@
+//! CLI argument definitions for `lp_parser`.
+
+use std::path::PathBuf;
+
+use clap::{Parser, Subcommand, ValueEnum};
+
+/// LP Parser - Parse, analyze, convert, and solve Linear Programming files
+#[derive(Parser)]
+#[command(name = "lp_parser")]
+#[command(author, version, about, long_about = None)]
+#[command(propagate_version = true)]
+pub struct Cli {
+    #[command(subcommand)]
+    pub command: Commands,
+
+    /// Increase output verbosity
+    #[arg(short, long, global = true, action = clap::ArgAction::Count)]
+    pub verbose: u8,
+
+    /// Suppress non-essential output
+    #[arg(short, long, global = true)]
+    pub quiet: bool,
+}
+
+#[derive(Subcommand)]
+pub enum Commands {
+    /// Parse an LP file and display its structure
+    Parse(ParseArgs),
+
+    /// Show detailed statistics about an LP problem
+    Info(InfoArgs),
+
+    /// Compare two LP files
+    #[cfg(feature = "diff")]
+    Diff(DiffArgs),
+
+    /// Convert LP file to another format
+    Convert(ConvertArgs),
+
+    /// Solve an LP problem using external solvers
+    #[cfg(feature = "lp-solvers")]
+    Solve(SolveArgs),
+}
+
+#[derive(ValueEnum, Clone, Debug, Default)]
+pub enum OutputFormat {
+    /// Plain text output
+    #[default]
+    Text,
+    /// JSON output (requires 'serde' feature)
+    #[cfg(feature = "serde")]
+    Json,
+    /// YAML output (requires 'serde' feature)
+    #[cfg(feature = "serde")]
+    Yaml,
+}
+
+#[derive(clap::Args)]
+pub struct ParseArgs {
+    /// Path to the LP file
+    pub file: PathBuf,
+
+    /// Write output to file instead of stdout
+    #[arg(short, long)]
+    pub output: Option<PathBuf>,
+
+    /// Output format
+    #[arg(short, long, value_enum, default_value = "text")]
+    pub format: OutputFormat,
+
+    /// Pretty-print structured output (for JSON/YAML)
+    #[arg(long)]
+    pub pretty: bool,
+}
+
+#[derive(clap::Args)]
+#[allow(clippy::struct_excessive_bools)]
+pub struct InfoArgs {
+    /// Path to the LP file
+    pub file: PathBuf,
+
+    /// Write output to file instead of stdout
+    #[arg(short, long)]
+    pub output: Option<PathBuf>,
+
+    /// Output format
+    #[arg(short, long, value_enum, default_value = "text")]
+    pub format: OutputFormat,
+
+    /// Pretty-print structured output
+    #[arg(long)]
+    pub pretty: bool,
+
+    /// List all variables with their types
+    #[arg(long)]
+    pub variables: bool,
+
+    /// List all constraints
+    #[arg(long)]
+    pub constraints: bool,
+
+    /// List all objectives
+    #[arg(long)]
+    pub objectives: bool,
+}
+
+#[cfg(feature = "diff")]
+#[derive(clap::Args)]
+pub struct DiffArgs {
+    /// First LP file (base)
+    pub file1: PathBuf,
+
+    /// Second LP file (to compare against)
+    pub file2: PathBuf,
+
+    /// Write output to file instead of stdout
+    #[arg(short, long)]
+    pub output: Option<PathBuf>,
+
+    /// Output format
+    #[arg(short, long, value_enum, default_value = "text")]
+    pub format: OutputFormat,
+
+    /// Pretty-print structured output
+    #[arg(long)]
+    pub pretty: bool,
+}
+
+#[derive(ValueEnum, Clone, Debug, Default)]
+pub enum ConvertFormat {
+    /// LP file format
+    #[default]
+    Lp,
+    /// CSV files (constraints.csv, objectives.csv, variables.csv)
+    #[cfg(feature = "csv")]
+    Csv,
+    /// JSON format
+    #[cfg(feature = "serde")]
+    Json,
+    /// YAML format
+    #[cfg(feature = "serde")]
+    Yaml,
+}
+
+#[derive(clap::Args)]
+pub struct ConvertArgs {
+    /// Path to the LP file
+    pub file: PathBuf,
+
+    /// Output file or directory (required for CSV)
+    #[arg(short, long)]
+    pub output: Option<PathBuf>,
+
+    /// Target format
+    #[arg(short, long, value_enum, default_value = "lp")]
+    pub format: ConvertFormat,
+
+    /// Pretty-print output (for JSON/YAML)
+    #[arg(long)]
+    pub pretty: bool,
+
+    /// Decimal precision for numbers
+    #[arg(long, default_value = "6")]
+    pub precision: usize,
+
+    /// Maximum line length before wrapping
+    #[arg(long, default_value = "80")]
+    pub max_line_length: usize,
+
+    /// Omit problem name comment in LP output
+    #[arg(long)]
+    pub no_problem_name: bool,
+
+    /// Compact output (no spacing between sections)
+    #[arg(long)]
+    pub compact: bool,
+}
+
+#[cfg(feature = "lp-solvers")]
+#[derive(ValueEnum, Clone, Debug, Default)]
+pub enum Solver {
+    /// CBC solver
+    #[default]
+    Cbc,
+    /// Gurobi solver
+    Gurobi,
+    /// CPLEX solver
+    Cplex,
+    /// GLPK solver
+    Glpk,
+}
+
+#[cfg(feature = "lp-solvers")]
+#[derive(clap::Args)]
+pub struct SolveArgs {
+    /// Path to the LP file
+    pub file: PathBuf,
+
+    /// Solver to use
+    #[arg(short, long, value_enum, default_value = "cbc")]
+    pub solver: Solver,
+
+    /// Write solution to file instead of stdout
+    #[arg(short, long)]
+    pub output: Option<PathBuf>,
+
+    /// Output format
+    #[arg(short, long, value_enum, default_value = "text")]
+    pub format: OutputFormat,
+
+    /// Pretty-print structured output
+    #[arg(long)]
+    pub pretty: bool,
+}