sdf-sampler 0.3.0__py3-none-any.whl → 0.4.0__py3-none-any.whl

sdf_sampler/__init__.py

@@ -47,7 +47,7 @@ from sdf_sampler.models import (
 )
 from sdf_sampler.sampler import SDFSampler
 
-__version__ = "0.3.0"
+__version__ = "0.4.0"
 
 __all__ = [
     # Main classes

sdf_sampler/analyzer.py

@@ -14,6 +14,7 @@ from sdf_sampler.algorithms.voxel_regions import generate_voxel_region_constrain
 from sdf_sampler.config import AnalyzerConfig, AutoAnalysisOptions
 from sdf_sampler.models.analysis import (
     ALL_ALGORITHMS,
+    DEFAULT_ALGORITHMS,
     AlgorithmStats,
     AlgorithmType,
     AnalysisResult,
@@ -93,7 +94,7 @@ class SDFAnalyzer:
                 raise ValueError(f"normals shape {normals.shape} doesn't match xyz {xyz.shape}")
 
         # Determine which algorithms to run
-        algo_list = algorithms if algorithms else [a.value for a in ALL_ALGORITHMS]
+        algo_list = algorithms if algorithms else [a.value for a in DEFAULT_ALGORITHMS]
         algo_list = [a for a in algo_list if a in [alg.value for alg in ALL_ALGORITHMS]]
 
         # Run algorithms and collect constraints

sdf_sampler/cli.py

@@ -169,10 +169,10 @@ def add_output_options(parser: argparse.ArgumentParser) -> None:
         help="Include original surface points (phi=0) in output",
     )
     group.add_argument(
-        "--surface-point-ratio",
-        type=float,
-        default=0.1,
-        help="Ratio of surface points to include (default: 0.1 = 10%%)",
+        "--surface-point-count",
+        type=int,
+        default=1000,
+        help="Number of surface points to include (default: 1000)",
     )
 
 
@@ -463,7 +463,7 @@ def cmd_sample(args: argparse.Namespace) -> int:
     # Include surface points if requested
     if args.include_surface_points:
         samples = _add_surface_points(
-            samples, xyz, normals, args.surface_point_ratio, args.verbose
+            samples, xyz, normals, args.surface_point_count, args.verbose
         )
 
     if args.verbose:
@@ -541,7 +541,7 @@ def cmd_pipeline(args: argparse.Namespace) -> int:
     # Include surface points if requested
     if args.include_surface_points:
         samples = _add_surface_points(
-            samples, xyz, normals, args.surface_point_ratio, args.verbose
+            samples, xyz, normals, args.surface_point_count, args.verbose
         )
 
     if args.verbose:
@@ -557,14 +557,14 @@ def _add_surface_points(
     samples: list,
     xyz: np.ndarray,
     normals: np.ndarray | None,
-    ratio: float,
+    count: int,
     verbose: bool,
 ) -> list:
     """Add surface points to sample list."""
     from sdf_sampler.models import TrainingSample
 
-    n_surface = int(len(xyz) * ratio)
-    if n_surface == 0:
+    n_surface = min(count, len(xyz))
+    if n_surface <= 0:
         return samples
 
     # Subsample if needed

sdf_sampler/models/analysis.py

@@ -26,6 +26,13 @@ ALL_ALGORITHMS = [
     AlgorithmType.NORMAL_IDW,
 ]
 
+# Default algorithms (excludes normal_idw which is opt-in)
+DEFAULT_ALGORITHMS = [
+    AlgorithmType.FLOOD_FILL,
+    AlgorithmType.VOXEL_REGIONS,
+    AlgorithmType.NORMAL_OFFSET,
+]
+
 
 class GeneratedConstraint(BaseModel):
     """A constraint generated by auto-analysis.

sdf_sampler/sampler.py

@@ -66,7 +66,7 @@ class SDFSampler:
         strategy: str | SamplingStrategy = SamplingStrategy.INVERSE_SQUARE,
         seed: int | None = None,
         include_surface_points: bool = False,
-        surface_point_ratio: float = 0.1,
+        surface_point_count: int | None = None,
     ) -> list[TrainingSample]:
         """Generate training samples from constraints.
 
@@ -78,7 +78,7 @@ class SDFSampler:
             strategy: Sampling strategy (CONSTANT, DENSITY, or INVERSE_SQUARE)
             seed: Random seed for reproducibility
             include_surface_points: If True, include original surface points with phi=0
-            surface_point_ratio: Fraction of surface points to include (default 0.1 = 10%)
+            surface_point_count: Number of surface points to include (default: 1000, or len(xyz) if smaller)
 
         Returns:
             List of TrainingSample objects
@@ -160,8 +160,10 @@ class SDFSampler:
 
         # Add surface points if requested
         if include_surface_points:
+            # Default to 1000 surface points, or all points if smaller
+            count = surface_point_count if surface_point_count is not None else min(1000, len(xyz))
             samples.extend(
-                self._generate_surface_points(xyz, normals, surface_point_ratio, rng)
+                self._generate_surface_points(xyz, normals, count, rng)
             )
 
         return samples
@@ -170,7 +172,7 @@ class SDFSampler:
         self,
         xyz: np.ndarray,
         normals: np.ndarray | None,
-        ratio: float,
+        count: int,
         rng: np.random.Generator,
     ) -> list[TrainingSample]:
         """Generate surface point samples (phi=0) from the input point cloud.
@@ -178,14 +180,14 @@ class SDFSampler:
         Args:
             xyz: Point cloud positions (N, 3)
             normals: Optional point normals (N, 3)
-            ratio: Fraction of points to include (0.0 to 1.0)
+            count: Number of surface points to include
             rng: Random number generator
 
         Returns:
             List of TrainingSample objects with phi=0
         """
-        n_surface = int(len(xyz) * ratio)
-        if n_surface == 0:
+        n_surface = min(count, len(xyz))
+        if n_surface <= 0:
             return []
 
         # Subsample if needed

{sdf_sampler-0.3.0.dist-info → sdf_sampler-0.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sdf-sampler
-Version: 0.3.0
+Version: 0.4.0
 Summary: Auto-analysis and sampling of point clouds for SDF (Signed Distance Field) training data generation
 Project-URL: Repository, https://github.com/Chiark-Collective/sdf-sampler
 Author-email: Liam <liam@example.com>

{sdf_sampler-0.3.0.dist-info → sdf_sampler-0.4.0.dist-info}/RECORD

@@ -1,10 +1,10 @@
-sdf_sampler/__init__.py,sha256=Kd5g1IROdKbRTR_gNSO4ff1ddNVP4WZJ30JFUbILa5k,1891
+sdf_sampler/__init__.py,sha256=FHnKJRr5pvXppAkkkofZwF7BE4BZjq1xKeCprQHg_hU,1891
 sdf_sampler/__main__.py,sha256=6N7jJs2Efs1AmM7qXXXN9V-ErFTWpPqKzWTeiujtGhU,490
-sdf_sampler/analyzer.py,sha256=p5Pkoa01dBGFqqQs2wpWrr8ilPMsjkB4ODJEI2IWbdo,11674
-sdf_sampler/cli.py,sha256=ykW1_cPBV6G1ZtKmq0ZyjgUmVK-ESqk3Ey6SLMRIhSQ,20144
+sdf_sampler/analyzer.py,sha256=bF0jiqJg0tc8H3c6O1f7Ac6tYxsHsT8Y0ShyoRcZnGg,11702
+sdf_sampler/cli.py,sha256=DB6oAYCfH80hSGHt2IgUBa5tNock9HfeB_6Xsea2oDs,20135
 sdf_sampler/config.py,sha256=lrPM1ktFkv32RRtOz6R-ShUFlBZ2LvoAl1hRLThmgKw,5185
 sdf_sampler/io.py,sha256=DfdXJa_2KQhja_T_a-jlVADcAABeF-NR8e3_vnIJHnk,4968
-sdf_sampler/sampler.py,sha256=3yVT5LHB7-rIxdor-aSdkC6Qew5M-7UvZCKwtIZG0IQ,17744
+sdf_sampler/sampler.py,sha256=G_t6o8HpXAP16s_V-dewYt9K_0Bq6Lx1vBPT7udmgMg,17915
 sdf_sampler/algorithms/__init__.py,sha256=pp7tSZ8q0zRXZ5S8D3tho7bJ62pmW8jceuuRXtiXIzU,777
 sdf_sampler/algorithms/flood_fill.py,sha256=iWGPPtOPSs0Cg7pxUlXUKGloFNCr8PuCHguRNy3c56c,7042
 sdf_sampler/algorithms/normal_idw.py,sha256=uX3MQDTDX0wVilwxDE9dFj9hm2xuBDHV-AZqspjz7sk,3270
@@ -13,7 +13,7 @@ sdf_sampler/algorithms/pocket.py,sha256=d6cvFz8C1ZFGgaOEySnFcKMPlHZ-kqOU_bBvOoXT
 sdf_sampler/algorithms/voxel_grid.py,sha256=LJz5V02AxSBRL0-kNEV3yEN_cMWFymGiepX0yysE6dw,11133
 sdf_sampler/algorithms/voxel_regions.py,sha256=YHr-apdq9wTo_po6v5L9HxQLkcZ1kP3KfJhoaQDZJOE,2422
 sdf_sampler/models/__init__.py,sha256=XWzMnPgvZyZF1ZUSfqlspIitLkzMn_0Yxj-hRF-ALEQ,1134
-sdf_sampler/models/analysis.py,sha256=h9CIxBeTQ89Z2-B3qdrlHM8qtOA0caijTYwzd9HsyUw,3251
+sdf_sampler/models/analysis.py,sha256=xSzz1jmpV3mOSM4gIF3NR4dhPXPH6UlxIgxZSOke5yE,3432
 sdf_sampler/models/constraints.py,sha256=k0v6-JwXmUkFXGycDpPG44amjoRo13xz1ggqdr9NVtE,7316
 sdf_sampler/models/samples.py,sha256=0DD7Z8D70zJKRTq16pik9SgGiRDeXh56EqmBZfql_sk,1474
 sdf_sampler/sampling/__init__.py,sha256=mbeU9DTHxR4R1D4WqjEzaYHq7bV1nSv-wywc3YoD_Lg,492
@@ -21,8 +21,8 @@ sdf_sampler/sampling/box.py,sha256=qRAumR1z_7vU9rfNvk-B6xNu62UeHSyQNghYiTwVR_Y,3
 sdf_sampler/sampling/brush.py,sha256=CcAgOYLdYXMM3y_H4fIwyzRJ8PZivFxkUHP7d0ElpNM,1991
 sdf_sampler/sampling/ray_carve.py,sha256=EsfzEGk33q0iWVzOJKDAJi2iWEsY-JZXmEfEZ0dmNdg,4444
 sdf_sampler/sampling/sphere.py,sha256=Xqpwq-RcEnAD6HhoyIC-ErxRHDknDKMtYf6aWUJ43_U,1680
-sdf_sampler-0.3.0.dist-info/METADATA,sha256=MU48zB7pLEhlGEO5ZTDcfP0l7DBXH3u3_iZI0oZJ4FU,10481
-sdf_sampler-0.3.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-sdf_sampler-0.3.0.dist-info/entry_points.txt,sha256=2IMWFbDYEqVUkpiRF1BlRMOhipeirPJSbv5PIOIZrvA,53
-sdf_sampler-0.3.0.dist-info/licenses/LICENSE,sha256=eeB8aLnEG-dgFYs2KqfMJaP52GFQT8sZPHwaYnHRW8E,1061
-sdf_sampler-0.3.0.dist-info/RECORD,,
+sdf_sampler-0.4.0.dist-info/METADATA,sha256=o1peEETZNWtfdDyIvd4NIZFm30imYZbPvvbyUAeWH1Y,10481
+sdf_sampler-0.4.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+sdf_sampler-0.4.0.dist-info/entry_points.txt,sha256=2IMWFbDYEqVUkpiRF1BlRMOhipeirPJSbv5PIOIZrvA,53
+sdf_sampler-0.4.0.dist-info/licenses/LICENSE,sha256=eeB8aLnEG-dgFYs2KqfMJaP52GFQT8sZPHwaYnHRW8E,1061
+sdf_sampler-0.4.0.dist-info/RECORD,,