Merge pull request #140 from nwittler/human-best-point

Saving optim points in human format.

Author: nwittler

c3/optimizers/optimizer.py

@@ -177,7 +177,7 @@ def log_parameters(self) -> None:
                     "units": self.pmap.get_opt_units(),
                     "optim_status": self.optim_status,
                 }
-                best_point.write(hjson.dumpsJSON(best_dict, default=hjson_encode))
+                best_point.write(hjson.dumps(best_dict, default=hjson_encode))
                 best_point.write("\n")
         if self.store_unitaries:
             self.exp.store_Udict(self.optim_status["goal"])

c3/utils/log_reader.py

@@ -20,33 +20,31 @@ def show_table(log: Dict[str, Any], console: Console) -> None:
     console : Console
         Rich console for output.
     """
-    if log:
-        opt_map = log["opt_map"]
-        optim_status = log["optim_status"]
-        units = log["units"]
-        params = optim_status["params"]
+    opt_map = log["opt_map"]
+    optim_status = log["optim_status"]
+    units = log["units"]
+    params = optim_status["params"]
+    if "gradient" not in optim_status:
+        grads = [0] * len(params)
+    else:
         grads = optim_status["gradient"]
+    table = Table(show_header=True, header_style="bold magenta")
+    table.add_column("Parameter")
+    table.add_column("Value", justify="right")
+    table.add_column("Gradient", justify="right")
+    for ii, equiv_ids in enumerate(opt_map):
+        par = params[ii]
+        par = num3str(par)
+        par_id = equiv_ids[0]
+        table.add_row(par_id, par + units[ii], num3str(grads[ii]) + units[ii])
+        for par_id in equiv_ids[1:]:
+            table.add_row(par_id, "''", "''")
 
-        table = Table(show_header=True, header_style="bold magenta")
-        table.add_column("Parameter")
-        table.add_column("Value", justify="right")
-        table.add_column("Gradient", justify="right")
-        for ii, equiv_ids in enumerate(opt_map):
-            par = params[ii]
-            grad = grads[ii]
-            par = num3str(par)
-            grad = num3str(grad)
-            par_id = equiv_ids[0]
-            table.add_row(par_id, par + units[ii], grad + units[ii])
-            if len(equiv_ids) > 1:
-                for par_id in equiv_ids[1:]:
-                    table.add_row(par_id, "''", "''")
-
-        console.clear()
-        print(
-            f"Optimization reached {optim_status['goal']:0.3g} at {optim_status['time']}\n"
-        )
-        console.print(table)
+    console.clear()
+    print(
+        f"Optimization reached {optim_status['goal']:0.3g} at {optim_status['time']}\n"
+    )
+    console.print(table)
 
 
 if __name__ == "__main__":