autoforge 1.3.3__tar.gz → 1.3.5__tar.gz

{autoforge-1.3.3 → autoforge-1.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: AutoForge
-Version: 1.3.3
+Version: 1.3.5
 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.3 → autoforge-1.3.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "AutoForge"
-version="1.3.3"
+version="1.3.5"
 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.3 → autoforge-1.3.5}/src/AutoForge.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: AutoForge
-Version: 1.3.3
+Version: 1.3.5
 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.3 → autoforge-1.3.5}/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
@@ -147,10 +147,11 @@ def composite_image(
             p_i = F.gumbel_softmax(global_logits[layer_idx], tau_global, hard=True)
 
         color_i = torch.matmul(p_i, material_colors)
-        TD_i = torch.matmul(p_i, material_TDs) * 0.1
+        TD_i = torch.matmul(p_i, material_TDs)
         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 / 10 <= h, torch.tensor(1.0), opac)
         opac = torch.clamp(opac, 0.0, 1.0)
 
         comp = comp + ((remaining * opac).unsqueeze(-1) * color_i)

{autoforge-1.3.3 → autoforge-1.3.5}/src/autoforge/Misc/color_fit_all.py

@@ -1638,8 +1638,11 @@ def optimize_model(
             if no_improvement_count >= 10000:
                 break
             # break if loss decrease is less than 1e-6 in last 100 steps
-            # if len(losses) > 1000 and np.mean(losses[-1000:-100]) - np.min(losses[-100:]) < 1e-6:
-            #    break
+            if (
+                len(losses) > 1000
+                and np.mean(losses[-1000:-100]) - np.min(losses[-100:]) < 1e-3
+            ):
+                break
             it += 1
             tbar.update(1)
         except Exception:
@@ -1808,16 +1811,28 @@ 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 28: Poly Degree 2": {
+        #     "func": model_poly2,
+        #     "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, 200.0), (0.0, 1.0)],
-            "param_names": ["A", "k", "B"],
+        "Model 29: Poly Degree 3": {
+            "func": model_poly3,
+            "ranges": [(0.0, 1.0), (0.0, 1.0)],
+            "param_names": ["p0", "p1"],
         },
     }
 
@@ -1870,7 +1885,7 @@ def main():
     # Now plot measured vs predicted for 10 random CSV rows using Plotly,
     # but only for the top 3 best models.
     best_three = results[:3]
-    plot_measured_vs_predicted(best_three, df, 16, layer_thickness, sample_size=20)
+    plot_measured_vs_predicted(best_three, df, 16, layer_thickness, sample_size=50)
 
 
 if __name__ == "__main__":