autoforge 1.3.2__tar.gz → 1.3.4__tar.gz

{autoforge-1.3.2 → autoforge-1.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: AutoForge
-Version: 1.3.2
+Version: 1.3.4
 Summary: AutoForge is a Python tool for generating 3D printed layered models from an input image.
 Author-email: Hendric Voss <hvoss@techfak.uni-bielefeld.de>
 License: CC BY-NC-SA 4.0

{autoforge-1.3.2 → autoforge-1.3.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "AutoForge"
-version="1.3.2"
+version="1.3.4"
 description = "AutoForge is a Python tool for generating 3D printed layered models from an input image."
 authors = [{ name = "Hendric Voss", email = "hvoss@techfak.uni-bielefeld.de" }]
 readme = "README.md"

{autoforge-1.3.2 → autoforge-1.3.4}/src/AutoForge.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: AutoForge
-Version: 1.3.2
+Version: 1.3.4
 Summary: AutoForge is a Python tool for generating 3D printed layered models from an input image.
 Author-email: Hendric Voss <hvoss@techfak.uni-bielefeld.de>
 License: CC BY-NC-SA 4.0

{autoforge-1.3.2 → autoforge-1.3.4}/src/autoforge/Helper/OptimizerHelper.py

@@ -112,10 +112,10 @@ def composite_image(
     comp = torch.zeros(H, W, 3, dtype=torch.float32, device=pixel_height.device)
     remaining = torch.ones(H, W, dtype=torch.float32, device=pixel_height.device)
 
-    o = -1.1021105e-02
-    A = 1.0786635e00
-    k = 3.0878708e01
-    b = -5.0812101e00
+    o = -1.2416557e-02
+    A = 9.6407950e-01
+    k = 3.4103447e01
+    b = -4.1554203e00
 
     for i in range(max_layers):
         layer_idx = max_layers - 1 - i
@@ -151,9 +151,8 @@ def composite_image(
         TD_i = torch.clamp(TD_i, 1e-8, 1e8)
 
         opac = o + (A * torch.log1p(k * (eff_thick / TD_i)) + b * (eff_thick / TD_i))
+        # opac = torch.where(TD_i <= h, torch.tensor(1.0), opac)
         opac = torch.clamp(opac, 0.0, 1.0)
-        # Setting opac to 1.0 for the layers where the thickness is less than 2*h to avoid single layer artifacts
-        opac = torch.where(TD_i <= h * 2, torch.tensor(1.0), opac)
 
         comp = comp + ((remaining * opac).unsqueeze(-1) * color_i)
         remaining = remaining * (1 - opac)

{autoforge-1.3.2 → autoforge-1.3.4}/src/autoforge/Misc/color_fit_all.py

@@ -959,11 +959,11 @@ def model_composite(
 #############################################
 
 extra_models = {
-    "Model 1: Linear": {
-        "func": model_linear,
-        "ranges": [(0.0, 1.0)],
-        "param_names": ["p0"],
-    },
+    # "Model 1: Linear": {
+    #     "func": model_linear,
+    #     "ranges": [(0.0, 1.0)],
+    #     "param_names": ["p0"],
+    # },
     "Model 13: New Model 4: Log-Linear": {
         "func": new_model4,
         "ranges": [(0.0, 1.0), (0.0, 100.0), (0.0, 1.0)],
@@ -1516,6 +1516,7 @@ class VectorizedLossModule(torch.jit.ScriptModule):
             color_i = foregrounds
             opac = offset + self.model_func(model_params, t_tensor, TD_i)
             opac = torch.clamp(opac, 0.0, 1.0)
+            # opac = torch.where(TD_i <= 0.4, torch.tensor(1.0), opac)
             comp = comp + ((remaining * opac).unsqueeze(-1) * color_i)
             remaining = remaining * (1 - opac)
 
@@ -1808,18 +1809,18 @@ def main():
     layer_thickness = 0.04  # mm per layer
     transmissions, backgrounds, foregrounds, measured = preprocess_data(df, num_layers)
 
-    extra_models = {
-        # "Model 43: Gamma CDF": {
-        #     "func": model_gamma,
-        #     "ranges": [(0.0, 1.0), (0.1, 5.0), (0.1, 5.0)],
-        #     "param_names": ["p0", "p1", "p2"],
-        # },
-        "Model 13: New Model 4: Log-Linear": {
-            "func": new_model4,
-            "ranges": [(0.0, 1.0), (0.0, 200.0), (0.0, 1.0)],
-            "param_names": ["A", "k", "B"],
-        },
-    }
+    # extra_models = {
+    #     # "Model 43: Gamma CDF": {
+    #     #     "func": model_gamma,
+    #     #     "ranges": [(0.0, 1.0), (0.1, 5.0), (0.1, 5.0)],
+    #     #     "param_names": ["p0", "p1", "p2"],
+    #     # },
+    #     "Model 13: New Model 4: Log-Linear": {
+    #         "func": new_model4,
+    #         "ranges": [(0.0, 1.0), (0.0, 200.0), (0.0, 1.0)],
+    #         "param_names": ["A", "k", "B"],
+    #     },
+    # }
 
     results = []
     # Loop over each candidate model in the dictionary.