more unit tests, cleanup

Author: mitzimorris

cmdstanpy/utils.py

@@ -557,7 +557,7 @@ def parse_rdump_value(rhs: str) -> Union[int, float, np.ndarray]:
 
 def check_sampler_csv(
     path: str,
-    is_fixed_param: Optional[bool] = None,
+    is_fixed_param: bool = False,
     iter_sampling: Optional[int] = None,
     iter_warmup: Optional[int] = None,
     save_warmup: bool = False,
@@ -610,9 +610,7 @@ def check_sampler_csv(
     return meta
 
 
-def scan_sampler_csv(
-    path: str, is_fixed_param: Optional[bool]
-) -> Dict[str, Any]:
+def scan_sampler_csv(path: str, is_fixed_param: bool = False) -> Dict[str, Any]:
     """Process sampler stan_csv output file line by line."""
     dict: Dict[str, Any] = {}
     lineno = 0

test/test_model.py

@@ -57,12 +57,24 @@ def test_model_good(self):
         self.assertEqual(BERN_STAN, model.stan_file)
         self.assertPathsEqual(model.exe_file, BERN_EXE)
 
+    def test_ctor_compile_arg(self):
         # instantiate, don't compile
-        os.remove(BERN_EXE)
+        if os.path.exists(BERN_EXE):
+            os.remove(BERN_EXE)
         model = CmdStanModel(stan_file=BERN_STAN, compile=False)
         self.assertEqual(BERN_STAN, model.stan_file)
         self.assertEqual(None, model.exe_file)
 
+        model = CmdStanModel(stan_file=BERN_STAN, compile=True)
+        self.assertPathsEqual(model.exe_file, BERN_EXE)
+        exe_time = os.path.getmtime(model.exe_file)
+
+        model = CmdStanModel(stan_file=BERN_STAN)
+        self.assertTrue(exe_time == os.path.getmtime(model.exe_file))
+
+        model = CmdStanModel(stan_file=BERN_STAN, compile='force')
+        self.assertTrue(exe_time < os.path.getmtime(model.exe_file))
+
     def test_exe_only(self):
         model = CmdStanModel(stan_file=BERN_STAN)
         self.assertEqual(BERN_EXE, model.exe_file)
@@ -109,6 +121,10 @@ def test_model_bad(self):
             CmdStanModel(
                 stan_file=os.path.join(DATAFILES_PATH, "external.stan")
             )
+        CmdStanModel(stan_file=BERN_STAN)
+        os.remove(BERN_EXE)
+        with self.assertRaises(ValueError):
+            CmdStanModel(stan_file=BERN_STAN, exe_file=BERN_EXE)
 
     def test_stanc_options(self):
         opts = {

test/test_sample.py

@@ -605,7 +605,7 @@ def test_fixed_param_unspecified(self):
         os.chmod(exe_only, 0o755)
         datagen2_model = CmdStanModel(exe_file=exe_only)
         datagen2_fit = datagen2_model.sample(
-            iter_sampling=200, show_progress=False
+            iter_sampling=200, show_console=True
         )
         self.assertEqual(datagen2_fit.chains, 4)
         self.assertEqual(datagen2_fit.step_size, None)