metafold 0.12.dev4__tar.gz → 0.12.dev5__tar.gz

{metafold-0.12.dev4 → metafold-0.12.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: metafold
-Version: 0.12.dev4
+Version: 0.12.dev5
 Summary: Metafold SDK for Python
 Author-email: Metafold 3D <info@metafold3d.com>
 License: Copyright 2024 Metafold 3D

{metafold-0.12.dev4 → metafold-0.12.dev5}/metafold/simulation/run_experiment.py

@@ -18,6 +18,8 @@ JSON manifest format
     "parts": [
         {
             "type": "piston_cylinder",
+            # optional geometry - omit to use default
+            "shape_parameters": {"top": [...], "bottom": [...], "radius": 0.02},
             "velocity": [           # optional — defaults to DEFAULT_PISTON_VELOCITY
                 [0.0,    0, 0,  0.0],
                 [0.002,  0, 0, -1.25],
@@ -26,6 +28,7 @@ JSON manifest format
                 [0.04,   0, 0,  0.0]
             ]
         },
+        {"type": "piston_box", "shape_parameters": {"min": [...], "max": [...]}},
         {"type": "piston_mesh", "file": "piston.ply", "velocity": [...]},
         {
             "type":           "mesh",
@@ -132,6 +135,7 @@ from metafold.simulation.compression_simulation import (
     CompressionSimulation,
     ExperimentMesh,
     ExperimentPart,
+    ExperimentPistonBox,
     ExperimentPistonCylinder,
     ExperimentPistonMesh,
     SimulationParameters,
@@ -171,8 +175,18 @@ def _build_parts(parts_config: list[dict]) -> list[ExperimentPart]:
             kwargs = {}
             if "velocity" in entry:
                 kwargs["velocity"] = entry["velocity"]
+            if "shape_parameters" in entry:
+                kwargs["shape_parameters"] = entry["shape_parameters"]
             parts.append(ExperimentPistonCylinder(**kwargs))
 
+        elif part_type == "piston_box":
+            kwargs = {}
+            if "velocity" in entry:
+                kwargs["velocity"] = entry["velocity"]
+            if "shape_parameters" in entry:
+                kwargs["shape_parameters"] = entry["shape_parameters"]
+            parts.append(ExperimentPistonBox(**kwargs))
+
         elif part_type == "piston_mesh":
             kwargs = {"filename": entry["file"]}
             if "velocity" in entry:

{metafold-0.12.dev4 → metafold-0.12.dev5}/metafold.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: metafold
-Version: 0.12.dev4
+Version: 0.12.dev5
 Summary: Metafold SDK for Python
 Author-email: Metafold 3D <info@metafold3d.com>
 License: Copyright 2024 Metafold 3D

{metafold-0.12.dev4 → metafold-0.12.dev5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "metafold"
-version = "0.12.dev4"
+version = "0.12.dev5"
 authors = [
     {name = "Metafold 3D", email = "info@metafold3d.com"},
 ]

{metafold-0.12.dev4 → metafold-0.12.dev5}/tests/test_run_experiment.py

@@ -16,6 +16,7 @@ from metafold.materials import (
 )
 from metafold.simulation.compression_simulation import (
     ExperimentMesh,
+    ExperimentPistonBox,
     ExperimentPistonCylinder,
     ExperimentPistonMesh,
     SimulationParameters,
@@ -92,6 +93,17 @@ class TestBuildParts:
         parts = _build_parts([{"type": "piston_cylinder"}])
         assert parts[0].velocity == DEFAULT_PISTON_VELOCITY
 
+    def test_piston_cylinder_with_shape_parameters(self):
+        shape = {"top": [0, 0, 0.01], "bottom": [0, 0, 0.012], "radius": 0.015}
+        parts = _build_parts([{"type": "piston_cylinder", "shape_parameters": shape}])
+        assert parts[0].shape_parameters == shape
+
+    def test_piston_box(self):
+        shape = {"min": [0, 0, 0.01], "max": [0.02, 0.02, 0.012]}
+        parts = _build_parts([{"type": "piston_box", "shape_parameters": shape}])
+        assert isinstance(parts[0], ExperimentPistonBox)
+        assert parts[0].shape_parameters == shape
+
     def test_piston_mesh(self):
         parts = _build_parts([{"type": "piston_mesh", "file": "piston.ply"}])
         assert isinstance(parts[0], ExperimentPistonMesh)