Merge pull request #15 from NeoGeographyToolkit/estimate-ages-error-fix

Crater and Rock fixes

src/python/synthterrain/crater/age.py

@@ -91,6 +91,9 @@ def estimate_age_by_bin(
     is compared to the d/D ratios from the diffusion run, and an estimated age
     is assigned.
     """
+    if df.empty:
+        raise ValueError("The provided dataframe has no rows.")
+
     logger.info("estimate_age_by_bin start.")
     bin_edges = np.geomspace(
         df["diameter"].min(), df["diameter"].max(), num=num + 1

src/python/synthterrain/crater/cli_convert.py

@@ -81,12 +81,18 @@ def main():
         b = df["diameter"].max()
         pd_func = crater_func.GNPF(a=a, b=b)
         eq_func = crater_func.VIPER_Env_Spec(a=a, b=b)
-        if "age" in df.columns:
-            df[df["age"] == 0] = estimate_age_by_bin(
-                df[df["age"] == 0], pd_func.csfd, eq_func.csfd, num=50
+        try:
+            if "age" in df.columns:
+                df[df["age"] == 0] = estimate_age_by_bin(
+                    df[df["age"] == 0], pd_func.csfd, eq_func.csfd, num=50
+                )
+            else:
+                df = estimate_age_by_bin(df, pd_func.csfd, eq_func.csfd, num=50)
+        except ValueError:
+            logger.error(
+                "The provided file has no craters with an age of zero."
             )
-        else:
-            df = estimate_age_by_bin(df, pd_func.csfd, eq_func.csfd, num=50)
+            return 1
 
     crater.to_file(df, args.outfile, xml=(args.outfile.suffix.casefold() == ".xml"))
 

src/python/synthterrain/rock/__init__.py

@@ -199,7 +199,7 @@ def place_rocks(
     position_idxs = rng.choice(
         len(flat_prob_map),
         size=len(diameters),
-        replace=False,
+        replace=True,
         p=flat_prob_map,
     )
 

src/python/synthterrain/rock/cli.py

@@ -76,7 +76,12 @@ def arg_parser():
         "in XML output that conforms to the old MATLAB code.",
     )
     parser.add_argument(
-        "-o", "--outfile", default=None, type=Path, help="Path to output file."
+        "-o",
+        "--outfile",
+        required=True,
+        default=None,
+        type=Path,
+        help="Path to output file.",
     )
 
     return parser