Skip to content

Commit d3fcdf7

Browse files
rmcdermormcdermo
authored
Merge pull request #15723 from rmcdermo/master
Python: suppress warnings for Quantity==0
2 parents abaec93 + 571f8e9 commit d3fcdf7

File tree

1 file changed

+47
-43
lines changed

1 file changed

+47
-43
lines changed

‎Utilities/Python/fdsplotlib.py‎

Lines changed: 47 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -610,21 +610,23 @@ def _parse_stat_xy_local(m):
610610

611611
flat_meas = np.atleast_1d(v_meas)
612612
flat_pred = np.atleast_1d(v_pred)
613-
nmin = min(flat_meas.size, flat_pred.size)
614-
if nmin == 0:
615-
print(f"[dataplot] Warning: no valid data pairs for {pp.Dataname}")
616-
else:
617-
if flat_meas.size != flat_pred.size:
618-
print(f"[dataplot] Truncated unequal vectors for {pp.Dataname}: "
619-
f"Measured={flat_meas.size}, Predicted={flat_pred.size} → {nmin}")
620-
flat_meas = flat_meas[:nmin]
621-
flat_pred = flat_pred[:nmin]
622613

623-
Save_Measured_Metric[-1] = flat_meas
624-
Save_Predicted_Metric[-1] = flat_pred
614+
if pp.Quantity != "0":
615+
nmin = min(flat_meas.size, flat_pred.size)
616+
if nmin == 0:
617+
print(f"[dataplot] Warning: no valid data pairs for {pp.Dataname}")
618+
else:
619+
if flat_meas.size != flat_pred.size:
620+
print(f"[dataplot] Truncated unequal vectors for {pp.Dataname}: "
621+
f"Measured={flat_meas.size}, Predicted={flat_pred.size} → {nmin}")
622+
flat_meas = flat_meas[:nmin]
623+
flat_pred = flat_pred[:nmin]
625624

626-
qty_label = str(pp.d2_Dep_Col_Name).strip() or "Unknown"
627-
Save_Predicted_Quantity[-1] = np.array([qty_label] * len(flat_pred), dtype=object)
625+
Save_Measured_Metric[-1] = flat_meas
626+
Save_Predicted_Metric[-1] = flat_pred
627+
628+
qty_label = str(pp.d2_Dep_Col_Name).strip() or "Unknown"
629+
Save_Predicted_Quantity[-1] = np.array([qty_label] * len(flat_pred), dtype=object)
628630

629631
plt.figure(f.number)
630632
os.makedirs(pltdir, exist_ok=True)
@@ -706,21 +708,22 @@ def _parse_stat_xy_local(m):
706708
flat_meas = np.atleast_1d(v_meas)
707709
flat_pred = np.atleast_1d(v_pred)
708710

709-
nmin = min(flat_meas.size, flat_pred.size)
710-
if nmin == 0:
711-
print(f"[dataplot] Warning: no valid data pairs for {pp.Dataname}")
712-
else:
713-
if flat_meas.size != flat_pred.size:
714-
print(f"[dataplot] Truncated unequal vectors for {pp.Dataname}: "
715-
f"Measured={flat_meas.size}, Predicted={flat_pred.size} → {nmin}")
716-
flat_meas = flat_meas[:nmin]
717-
flat_pred = flat_pred[:nmin]
711+
if pp.Quantity != "0":
712+
nmin = min(flat_meas.size, flat_pred.size)
713+
if nmin == 0:
714+
print(f"[dataplot] Warning: no valid data pairs for {pp.Dataname}")
715+
else:
716+
if flat_meas.size != flat_pred.size:
717+
print(f"[dataplot] Truncated unequal vectors for {pp.Dataname}: "
718+
f"Measured={flat_meas.size}, Predicted={flat_pred.size} → {nmin}")
719+
flat_meas = flat_meas[:nmin]
720+
flat_pred = flat_pred[:nmin]
718721

719-
Save_Measured_Metric[-1] = flat_meas
720-
Save_Predicted_Metric[-1] = flat_pred
722+
Save_Measured_Metric[-1] = flat_meas
723+
Save_Predicted_Metric[-1] = flat_pred
721724

722-
qty_label = str(pp.d2_Dep_Col_Name).strip() or "Unknown"
723-
Save_Predicted_Quantity[-1] = np.array([qty_label] * len(flat_pred), dtype=object)
725+
qty_label = str(pp.d2_Dep_Col_Name).strip() or "Unknown"
726+
Save_Predicted_Quantity[-1] = np.array([qty_label] * len(flat_pred), dtype=object)
724727

725728
plt.figure(f.number)
726729
os.makedirs(pltdir, exist_ok=True)
@@ -805,23 +808,24 @@ def _parse_stat_xy_local(m):
805808
flat_meas = np.concatenate(meas_list) if meas_list else np.array([])
806809
flat_pred = np.concatenate(pred_list) if pred_list else np.array([])
807810

808-
nmin = min(flat_meas.size, flat_pred.size)
809-
if nmin == 0:
810-
print(f"[dataplot] Warning: no valid data pairs for {pp.Dataname}")
811-
else:
812-
if flat_meas.size != flat_pred.size:
813-
print(f"[dataplot] Truncated unequal vectors for {pp.Dataname}: "
814-
f"Measured={flat_meas.size}, Predicted={flat_pred.size} → {nmin}")
815-
# Truncate both sides to maintain one-to-one correspondence
816-
flat_meas = flat_meas[:nmin]
817-
flat_pred = flat_pred[:nmin]
818-
819-
# Save truncated paired arrays
820-
Save_Measured_Metric[-1] = flat_meas
821-
Save_Predicted_Metric[-1] = flat_pred
822-
823-
qty_label = str(pp.d2_Dep_Col_Name).strip() or "Unknown"
824-
Save_Predicted_Quantity[-1] = np.array([qty_label] * len(flat_pred), dtype=object)
811+
if pp.Quantity != "0":
812+
nmin = min(flat_meas.size, flat_pred.size)
813+
if nmin == 0:
814+
print(f"[dataplot] Warning: no valid data pairs for {pp.Dataname}")
815+
else:
816+
if flat_meas.size != flat_pred.size :
817+
print(f"[dataplot] Truncated unequal vectors for {pp.Dataname}: "
818+
f"Measured={flat_meas.size}, Predicted={flat_pred.size} → {nmin}")
819+
# Truncate both sides to maintain one-to-one correspondence
820+
flat_meas = flat_meas[:nmin]
821+
flat_pred = flat_pred[:nmin]
822+
823+
# Save truncated paired arrays
824+
Save_Measured_Metric[-1] = flat_meas
825+
Save_Predicted_Metric[-1] = flat_pred
826+
827+
qty_label = str(pp.d2_Dep_Col_Name).strip() or "Unknown"
828+
Save_Predicted_Quantity[-1] = np.array([qty_label] * len(flat_pred), dtype=object)
825829

826830
except Exception as e:
827831
print(f"[dataplot] Error computing predicted metric for {pp.Dataname}: {e}")

0 commit comments

Comments
 (0)