spyrrow 0.4.0__tar.gz → 0.6.0__tar.gz

{spyrrow-0.4.0 → spyrrow-0.6.0}/Cargo.lock

@@ -58,6 +58,24 @@ version = "1.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
 
+[[package]]
+name = "approx"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "atomic-polyfill"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8cf2bce30dfe09ef0bfaef228b9d414faaf7e563035494d7fe092dba54b300f4"
+dependencies = [
+ "critical-section",
+]
+
 [[package]]
 name = "autocfg"
 version = "1.4.0"
@@ -70,6 +88,12 @@ version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
 
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
@@ -128,6 +152,12 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
 
+[[package]]
+name = "critical-section"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b"
+
 [[package]]
 name = "crossbeam-deque"
 version = "0.8.6"
@@ -202,6 +232,58 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "float_next_after"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8"
+
+[[package]]
+name = "geo"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7d640a4dd1d1c98b45f4653c841a8ec15f461a71b86bc30533ae64c6f20f268"
+dependencies = [
+ "float_next_after",
+ "geo-types",
+ "geographiclib-rs",
+ "log",
+ "num-traits",
+ "robust",
+ "rstar",
+]
+
+[[package]]
+name = "geo-buffer"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "267bf0373df2f0b0b05065ebc0c84b97ccd221e19e0cb9442bcffe8fce04c130"
+dependencies = [
+ "geo",
+ "geo-types",
+]
+
+[[package]]
+name = "geo-types"
+version = "0.7.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62ddb1950450d67efee2bbc5e429c68d052a822de3aad010d28b351fbb705224"
+dependencies = [
+ "approx",
+ "num-traits",
+ "rstar",
+ "serde",
+]
+
+[[package]]
+name = "geographiclib-rs"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f611040a2bb37eaa29a78a128d1e92a378a03e0b6e66ae27398d42b1ba9a7841"
+dependencies = [
+ "libm",
+]
+
 [[package]]
 name = "getrandom"
 version = "0.3.2"
@@ -214,6 +296,28 @@ dependencies = [
  "wasi",
 ]
 
+[[package]]
+name = "hash32"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67"
+dependencies = [
+ "byteorder",
+]
+
+[[package]]
+name = "heapless"
+version = "0.7.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdc6457c0eb62c71aac4bc17216026d8410337c4126773b9c5daba343f17964f"
+dependencies = [
+ "atomic-polyfill",
+ "hash32",
+ "rustc_version",
+ "spin",
+ "stable_deref_trait",
+]
+
 [[package]]
 name = "heck"
 version = "0.5.0"
@@ -255,12 +359,14 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "jagua-rs"
-version = "0.5.1"
-source = "git+https://github.com/JeroenGar/jagua-rs.git?rev=3d36f849653e3e2273be9f6a7fd24da51ded585d#3d36f849653e3e2273be9f6a7fd24da51ded585d"
+version = "0.6.2"
+source = "git+https://github.com/JeroenGar/jagua-rs.git?rev=6e47329e4fd8dfe014428bd9045db132d26d35c9#6e47329e4fd8dfe014428bd9045db132d26d35c9"
 dependencies = [
  "anyhow",
  "document-features",
  "float-cmp",
+ "geo-buffer",
+ "geo-types",
  "itertools",
  "log",
  "ndarray",
@@ -270,7 +376,6 @@ dependencies = [
  "serde",
  "slotmap",
  "svg",
- "tribool",
 ]
 
 [[package]]
@@ -332,6 +437,16 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5"
 
+[[package]]
+name = "lock_api"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
 [[package]]
 name = "log"
 version = "0.4.27"
@@ -630,12 +745,50 @@ dependencies = [
  "crossbeam-utils",
 ]
 
+[[package]]
+name = "robust"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5864e7ef1a6b7bcf1d6ca3f655e65e724ed3b52546a0d0a663c991522f552ea"
+
+[[package]]
+name = "rstar"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f39465655a1e3d8ae79c6d9e007f4953bfc5d55297602df9dc38f9ae9f1359a"
+dependencies = [
+ "heapless",
+ "num-traits",
+ "smallvec",
+]
+
+[[package]]
+name = "rustc_version"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
+dependencies = [
+ "semver",
+]
+
 [[package]]
 name = "ryu"
 version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
 
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "semver"
+version = "1.0.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0"
+
 [[package]]
 name = "serde"
 version = "1.0.219"
@@ -677,10 +830,16 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "smallvec"
+version = "1.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
+
 [[package]]
 name = "sparrow"
 version = "0.1.0"
-source = "git+https://github.com/JeroenGar/sparrow.git?rev=3adafa222a260dc3f83a15a899541d2c51fae5d6#3adafa222a260dc3f83a15a899541d2c51fae5d6"
+source = "git+https://github.com/JeroenGar/sparrow.git?rev=7f069e9d146f5599d7ba69a47ab4e8097c56e54f#7f069e9d146f5599d7ba69a47ab4e8097c56e54f"
 dependencies = [
  "anyhow",
  "clap",
@@ -691,6 +850,7 @@ dependencies = [
  "jagua-rs",
  "jiff",
  "log",
+ "ndarray",
  "num_cpus",
  "numfmt",
  "ordered-float",
@@ -705,9 +865,18 @@ dependencies = [
  "test-case",
 ]
 
+[[package]]
+name = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+dependencies = [
+ "lock_api",
+]
+
 [[package]]
 name = "spyrrow"
-version = "0.4.0"
+version = "0.6.0"
 dependencies = [
  "jagua-rs",
  "pyo3",
@@ -717,6 +886,12 @@ dependencies = [
  "sparrow",
 ]
 
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
 [[package]]
 name = "strsim"
 version = "0.11.1"
@@ -785,12 +960,6 @@ dependencies = [
  "test-case-core",
 ]
 
-[[package]]
-name = "tribool"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e8660361502033a51e119386b47fbb811e5706722f2e91ccf867aa6b2b09f90"
-
 [[package]]
 name = "unicode-ident"
 version = "1.0.18"

{spyrrow-0.4.0 → spyrrow-0.6.0}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "spyrrow"
-version = "0.4.0"
+version = "0.6.0"
 edition = "2024"
 license = "MIT"
 
@@ -10,9 +10,9 @@ name = "spyrrow"
 crate-type = ["cdylib"]
 
 [dependencies]
-jagua-rs = { git = "https://github.com/JeroenGar/jagua-rs.git", rev="3d36f849653e3e2273be9f6a7fd24da51ded585d", features = ["spp"], default-features = false}
+jagua-rs = { git = "https://github.com/JeroenGar/jagua-rs.git", rev="6e47329e4fd8dfe014428bd9045db132d26d35c9", features = ["spp"], default-features = false}
 pyo3 = "0.24.0"
 rand = { version = "0.9.0", features = ["small_rng"] }
 serde = {version = "1.0.219", features = ["derive"]}
 serde_json = "1.0.140"
-sparrow = { git = "https://github.com/JeroenGar/sparrow.git",rev="3adafa222a260dc3f83a15a899541d2c51fae5d6",features = ["only_final_svg"], default-features = false}
+sparrow = { git = "https://github.com/JeroenGar/sparrow.git",rev="7f069e9d146f5599d7ba69a47ab4e8097c56e54f",features = ["only_final_svg"], default-features = false}

{spyrrow-0.4.0 → spyrrow-0.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: spyrrow
-Version: 0.4.0
+Version: 0.6.0
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
@@ -35,10 +35,10 @@ pip install spyrrow
 import spyrrow
 
 rectangle1 = spyrrow.Item(
-        0, [(0, 0), (1, 0), (1, 1), (0, 1), (0, 0)], demand=4, allowed_orientations=[0]
+        "rectangle", [(0, 0), (1, 0), (1, 1), (0, 1), (0, 0)], demand=4, allowed_orientations=[0]
     )
 triangle1 = spyrrow.Item(
-        1,
+         "triangle",
         [(0, 0), (1, 0), (1, 1), (0, 0)],
         demand=6,
         allowed_orientations=[0, 90, 180, -90],

{spyrrow-0.4.0 → spyrrow-0.6.0}/README.md

@@ -21,10 +21,10 @@ pip install spyrrow
 import spyrrow
 
 rectangle1 = spyrrow.Item(
-        0, [(0, 0), (1, 0), (1, 1), (0, 1), (0, 0)], demand=4, allowed_orientations=[0]
+        "rectangle", [(0, 0), (1, 0), (1, 1), (0, 1), (0, 0)], demand=4, allowed_orientations=[0]
     )
 triangle1 = spyrrow.Item(
-        1,
+         "triangle",
         [(0, 0), (1, 0), (1, 1), (0, 0)],
         demand=6,
         allowed_orientations=[0, 90, 180, -90],

{spyrrow-0.4.0 → spyrrow-0.6.0}/docs/conf.py

@@ -9,7 +9,7 @@
 project = 'spyrrow'
 copyright = '2025, Paul Durand-Lupinski'
 author = 'Paul Durand-Lupinski'
-release = '0.4.0'
+release = '0.5.0'
 
 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration

{spyrrow-0.4.0 → spyrrow-0.6.0}/docs/index.rst

@@ -36,10 +36,10 @@ Examples
    import spyrrow
 
    rectangle1 = spyrrow.Item(
-         0, [(0, 0), (1, 0), (1, 1), (0, 1), (0, 0)], demand=4, allowed_orientations=[0]
+         "rectangle", [(0, 0), (1, 0), (1, 1), (0, 1), (0, 0)], demand=4, allowed_orientations=[0]
       )
    triangle1 = spyrrow.Item(
-         1,
+         "triangle",
          [(0, 0), (1, 0), (1, 1), (0, 0)],
          demand=6,
          allowed_orientations=[0, 90, 180, -90],
@@ -54,4 +54,17 @@ Examples
       print(pi.id)
       print(pi.rotation)
       print(pi.translation)
-      print("\n")
+      print("\n")
+
+In order to express that an Item can rotate freely, its `allowed_orientations` attributes should be set to `None`.
+
+.. code-block:: python
+
+   import spyrrow
+
+   triangle1 = spyrrow.Item(
+         "triangle",
+         [(0, 0), (1, 0), (1, 1), (0, 0)],
+         demand=6,
+         allowed_orientations=None,
+      )

{spyrrow-0.4.0 → spyrrow-0.6.0}/spyrrow.pyi

@@ -3,52 +3,51 @@ from typing import TypeAlias
 Point: TypeAlias = tuple[float, float]
 
 class Item:
-    id: int
+    id: str
     demand: int
     shape: list[Point]
     allowed_orientations: list[float]
 
     def __init__(
         self,
-        id: int,
+        id: str,
         shape: list[Point],
         demand: int,
-        allowed_orientations: list[float],
+        allowed_orientations: list[float] | None,
     ):
         """
         An Item represents any closed 2D shape by its outer boundary.
 
         Spyrrow doesn't support hole(s) inside the shape as of yet. Therefore no Item can be nested inside another.
 
-        Continous rotation is not supported as of yet. A workaround  is to specify any integer degrees between 0 and 360
-        to the allowed_orientations list.
-
         Args:
-            id: The Item identifier for a given StripPackingInstance.
-              Best autoincremented as the instance verifies that all ids are presents starting from 0.
+            id (str): The Item identifier
+              Needs to be unique accross all Items of a StripPackingInstance
             shape: An ordered list of (x,y) defining the shape boundary. The shape is represented as a polygon formed by this list of points.
               The origin point can be included twice as the finishing point. If not, [last point, first point] is infered to be the last straight line of the shape.
             demand: The quantity of identical Items to be placed inside the strip. Should be positive.
-            allowed_orientations: List of angles in degrees allowed. An empty list is equivalent to [0.].
+            allowed_orientations (list[float]|None): List of angles in degrees allowed.
+              An empty list is equivalent to [0.].
+              A None value means that the item is free to rotate
               The algorithmn is only very weakly sensible to the length of the list given.
 
         """
-    
-    def to_json_str(self)->str:
-        """ Return a string of the JSON representation of the object"""
+
+    def to_json_str(self) -> str:
+        """Return a string of the JSON representation of the object"""
 
 class PlacedItem:
     """
     An object representing where a copy of an Item was placed inside the strip.
 
     Attributes:
-        id (int): The Item identifier for a given StripPackingInstance.
-        translation (tuple[float,float]): the translation vector in the X-Y axis
-        rotation (float): The roation angle in degrees, assuming that the original Item was defined with 0° as its rotation angle.
+        id (str): The Item identifier referencing the items of the StripPackingInstance
+        rotation (float): The rotation angle in degrees, assuming that the original Item was defined with 0° as its rotation angle.
+          Use the origin (0.0,0.0) as the rotation point.
+        translation (tuple[float,float]): the translation vector in the X-Y axis. To apply after the rotation
     """
 
-    id: int
-    shape: list[Point]
+    id: str
     translation: Point
     rotation: float
 
@@ -82,14 +81,11 @@ class StripPackingInstance:
               An empty string '' can be used, if the user doesn't have a use for this name.
             strip_height (float): the fixed height of the strip. The unit should be compatible with the Item
             items (list[Item]): The Items which defines the instances. All Items should be defined with the same scale ( same length unit).
-              Items ids should be an increasing series starting at 0 until len(items)-1.
-
          Raises:
             ValueError
         """
-    def to_json_str(self)->str:
-        """ Return a string of the JSON representation of the object"""
-
+    def to_json_str(self) -> str:
+        """Return a string of the JSON representation of the object"""
 
     def solve(self, computation_time: int = 600) -> StripPackingSolution:
         """

{spyrrow-0.4.0 → spyrrow-0.6.0}/src/lib.rs

@@ -11,6 +11,7 @@ use sparrow::config::{
     CDE_CONFIG, COMPRESS_TIME_RATIO, EXPLORE_TIME_RATIO, MIN_ITEM_SEPARATION, SIMPL_TOLERANCE,
 };
 use sparrow::optimizer::{Terminator, optimize};
+use std::collections::HashSet;
 use std::fs;
 use std::time::Duration;
 
@@ -20,20 +21,20 @@ use std::time::Duration;
 ///
 /// Spyrrow doesn't support hole(s) inside the shape as of yet. Therefore no Item can be nested inside another.
 ///
-/// Continous rotation is not supported as of yet. A workaround  is to specify any integer degrees between 0 and 360
-/// to the allowed_orientations list.
 ///
 /// Args:
-///     id (int): The Item identifier for a given StripPackingInstance.
-///       Best autoincremented as the instance verifies that all ids are presents starting from 0.
+///     id (str): The Item identifier
+///       Needs to be unique accross all Items of a StripPackingInstance
 ///     shape (list[tuple[float,float]]): An ordered list of (x,y) defining the shape boundary. The shape is represented as a polygon formed by this list of points.
 ///       The origin point can be included twice as the finishing point. If not, [last point, first point] is infered to be the last straight line of the shape.
 ///     demand (int): The quantity of identical Items to be placed inside the strip. Should be positive.
-///     allowed_orientations (list[float]): List of angles in degrees allowed. An empty list is equivalent to [0.].
+///     allowed_orientations (list[float]|None): List of angles in degrees allowed.
+///       An empty list is equivalent to [0.].
+///       A None value means that the item is free to rotate
 ///       The algorithmn is only very weakly sensible to the length of the list given.
 ///
 struct ItemPy {
-    id: u64,
+    id: String,
     demand: u64,
     allowed_orientations: Option<Vec<f32>>,
     shape: Vec<(f32, f32)>,
@@ -42,11 +43,16 @@ struct ItemPy {
 #[pymethods]
 impl ItemPy {
     #[new]
-    fn new(id: u64, shape: Vec<(f32, f32)>, demand: u64, allowed_orientations: Vec<f32>) -> Self {
+    fn new(
+        id: String,
+        shape: Vec<(f32, f32)>,
+        demand: u64,
+        allowed_orientations: Option<Vec<f32>>,
+    ) -> Self {
         ItemPy {
             id,
             demand,
-            allowed_orientations: Some(allowed_orientations),
+            allowed_orientations,
             shape,
         }
     }
@@ -78,34 +84,19 @@ impl ItemPy {
     }
 }
 
-impl From<ItemPy> for ExtItem {
-    fn from(value: ItemPy) -> Self {
-        let polygon = ExtSPolygon(value.shape);
-        let shape = ExtShape::SimplePolygon(polygon);
-        let base = BaseItem {
-            id: value.id,
-            allowed_orientations: value.allowed_orientations,
-            shape,
-            min_quality: None,
-        };
-        ExtItem {
-            base,
-            demand: value.demand,
-        }
-    }
-}
-
 #[pyclass(name = "PlacedItem", get_all)]
 #[derive(Clone, Debug)]
 /// An object representing where a copy of an Item was placed inside the strip.
 ///
 /// Attributes:
-///     id (int): The Item identifier for a given StripPackingInstance.
-///     translation (tuple[float,float]): the translation vector in the X-Y axis
-///     rotation (float): The roation angle in degrees, assuming that the original Item was defined with 0° as its rotation angle.
+///     id (str): The Item identifier referencing the items of the StripPackingInstance
+///     rotation (float): The rotation angle in degrees, assuming that the original Item was defined with 0° as its rotation angle.
+///       Use the origin (0.0,0.0) as the rotation point.
+///     translation (tuple[float,float]): the translation vector in the X-Y axis. To apply after the rotation
+///       
 ///
 struct PlacedItemPy {
-    pub id: u64,
+    pub id: String,
     pub translation: (f32, f32),
     pub rotation: f32,
 }
@@ -127,6 +118,11 @@ struct StripPackingSolutionPy {
     pub density: f32,
 }
 
+fn all_unique(strings: &[&str]) -> bool {
+    let mut seen = HashSet::new();
+    strings.iter().all(|s| seen.insert(*s))
+}
+
 #[pyclass(name = "StripPackingInstance", get_all, set_all)]
 #[derive(Clone, Serialize)]
 /// An Instance of a Strip Packing Problem.
@@ -136,7 +132,6 @@ struct StripPackingSolutionPy {
 ///       An empty string '' can be used, if the user doesn't have a use for this name.
 ///     strip_height (float): the fixed height of the strip. The unit should be compatible with the Item
 ///     items (list[Item]): The Items which defines the instances. All Items should be defined with the same scale ( same length unit).
-///       Items ids should be an increasing series starting at 0 until len(items)-1.
 ///
 ///  Raises:
 ///     ValueError
@@ -149,7 +144,25 @@ struct StripPackingInstancePy {
 
 impl From<StripPackingInstancePy> for ExtSPInstance {
     fn from(value: StripPackingInstancePy) -> Self {
-        let items = value.items.into_iter().map(|v| v.into()).collect();
+        let items = value
+            .items
+            .into_iter()
+            .enumerate()
+            .map(|(idx, v)| {
+                let polygon = ExtSPolygon(v.shape);
+                let shape = ExtShape::SimplePolygon(polygon);
+                let base = BaseItem {
+                    id: idx as u64,
+                    allowed_orientations: v.allowed_orientations,
+                    shape,
+                    min_quality: None,
+                };
+                ExtItem {
+                    base,
+                    demand: v.demand,
+                }
+            })
+            .collect();
         ExtSPInstance {
             name: value.name,
             strip_height: value.strip_height,
@@ -162,14 +175,9 @@ impl From<StripPackingInstancePy> for ExtSPInstance {
 impl StripPackingInstancePy {
     #[new]
     fn new(name: String, strip_height: f32, items: Vec<ItemPy>) -> PyResult<Self> {
-        let mut item_ids: Vec<u64> = items.iter().map(|i| i.id).collect();
-        item_ids.sort();
-        let expected_ids: Vec<u64> = (0..items.len()).map(|idx| idx as u64).collect();
-        if item_ids != expected_ids {
-            let error_string = format!(
-                "The item ids are not ordered from 0 to the Items length -1: {:#?}",
-                item_ids
-            );
+        let item_ids: Vec<&str> = items.iter().map(|i| i.id.as_str()).collect();
+        if !all_unique(&item_ids) {
+            let error_string = format!("The item ids are not uniques: {:#?}", item_ids);
             return Err(PyValueError::new_err(error_string));
         }
         Ok(StripPackingInstancePy {
@@ -238,8 +246,8 @@ impl StripPackingInstancePy {
                 .placed_items
                 .into_iter()
                 .map(|jpi| PlacedItemPy {
-                    id: jpi.item_id,
-                    rotation: jpi.transformation.rotation,
+                    id: self.items[jpi.item_id as usize].id.clone(),
+                    rotation: jpi.transformation.rotation.to_degrees(), // Until sparrow exports to degrees instead of radians
                     translation: jpi.transformation.translation,
                 })
                 .collect();

{spyrrow-0.4.0 → spyrrow-0.6.0}/tests/test_basic.py

@@ -2,12 +2,11 @@ import spyrrow
 import pytest
 
 def test_basic():
-    ## Continuous rotation seems to not be implemented for strip packing
     rectangle1 = spyrrow.Item(
-        0, [(0, 0), (1, 0), (1, 1), (0, 1), (0, 0)], demand=4, allowed_orientations=[0]
+        "rectangle", [(0, 0), (1, 0), (1, 1), (0, 1), (0, 0)], demand=4, allowed_orientations=[0]
     )
     triangle1 = spyrrow.Item(
-        1,
+        "triangle",
         [(0, 0), (1, 0), (1, 1), (0, 0)],
         demand=6,
         allowed_orientations=[0, 90, 180, -90],
@@ -22,10 +21,10 @@ def test_basic():
 def test_2_consecutive_calls():
     # Test correpsonding to crash on the second consecutive call of solve method
     rectangle1 = spyrrow.Item(
-        0, [(0, 0), (1, 0), (1, 1), (0, 1), (0, 0)], demand=4, allowed_orientations=[0]
+        "rectangle", [(0, 0), (1, 0), (1, 1), (0, 1), (0, 0)], demand=4, allowed_orientations=[0]
     )
     triangle1 = spyrrow.Item(
-        1,
+        "triangle",
         [(0, 0), (1, 0), (1, 1), (0, 0)],
         demand=6,
         allowed_orientations=[0, 90, 180, -90],
@@ -39,9 +38,26 @@ def test_2_consecutive_calls():
     assert sol.width == pytest.approx(4,rel=0.2)
 
 def test_concave_polygons():
-    poly1 = spyrrow.Item(0,[(0, 0), (3, 0), (4, 1), (3, 2), (0, 2), (1, 1), (0, 0)],demand=2,allowed_orientations=[0,90,180,270])
-    poly2 = spyrrow.Item(1,[(0, 0), (1, 0), (1, 2), (3, 2), (3, 0), (4, 0), (4, 3), (0, 3), (0, 0)], demand=3, allowed_orientations=[0,90,180,270])
+    poly1 = spyrrow.Item("0",[(0, 0), (3, 0), (4, 1), (3, 2), (0, 2), (1, 1), (0, 0)],demand=2,allowed_orientations=[0,90,180,270])
+    poly2 = spyrrow.Item("1",[(0, 0), (1, 0), (1, 2), (3, 2), (3, 0), (4, 0), (4, 3), (0, 3), (0, 0)], demand=3, allowed_orientations=[0,90,180,270])
     instance = spyrrow.StripPackingInstance(
         "test", strip_height=4.001, items=[poly1, poly2]
     )
-    sol = instance.solve(30)
+    sol = instance.solve(30)
+
+def test_continuous_rotation():
+    rectangle1 = spyrrow.Item(
+        "rectangle", [(0, 0), (1, 0), (1, 1), (0, 1), (0, 0)], demand=4, allowed_orientations=None
+    )
+    triangle1 = spyrrow.Item(
+        "triangle",
+        [(0, 0), (1, 0), (1, 1), (0, 0)],
+        demand=6,
+        allowed_orientations=None,
+    )
+
+    instance = spyrrow.StripPackingInstance(
+        "test", strip_height=2.001, items=[rectangle1, triangle1]
+    )
+    sol = instance.solve(30)
+    assert sol.width == pytest.approx(4,rel=0.2)