From f6482edd3f82498895da436098a7b5a298bbf23a Mon Sep 17 00:00:00 2001 From: "Timur A. Fatkhullin" Date: Mon, 30 Mar 2026 09:57:15 +0300 Subject: [PATCH] ... --- tests/mcc_pcm_z1000_test.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/tests/mcc_pcm_z1000_test.cpp b/tests/mcc_pcm_z1000_test.cpp index 38d2c06..5b0c15b 100644 --- a/tests/mcc_pcm_z1000_test.cpp +++ b/tests/mcc_pcm_z1000_test.cpp @@ -97,11 +97,12 @@ int main(int narg, char* argv[]) std::println("\n\n{:*^40}\n", " FITTED DIFFS "); auto tab = pcm_cstr.getTable(); for (size_t i = 0; i < pcm_cstr.numberOfPoints(); ++i) { - std::println("{} {} {} {:6.2f}% ({:5.3f}) {} {} {:6.2f}% ({:5.3f})", i, + std::println("{} {} {} {:6.2f}% ({:5.3f}) {} {} {:6.2f}% ({:5.3f}) (HA = {} DEC = {})", i, MccAngleFancyString(tab.colon_res[i]), MccAngleFancyString(r.model_colon[i]), - std::abs(r.colon_res[i] / tab.colon_res[i]) * 100.0, r.colon_weight[i], + std::abs((tab.colon_res[i] - r.model_colon[i]) / tab.colon_res[i]) * 100.0, r.colon_weight[i], MccAngleFancyString(tab.colat_res[i]), MccAngleFancyString(r.model_colat[i]), - std::abs(r.colat_res[i] / tab.colat_res[i]) * 100.0, r.colat_weight[i]); + std::abs((tab.colat_res[i] - r.model_colat[i]) / tab.colat_res[i]) * 100.0, r.colat_weight[i], + MccAngle(tab.hw_colon[i]).sexagesimal(true), MccAngle(tab.hw_colat[i]).sexagesimal()); } @@ -120,10 +121,12 @@ int main(int narg, char* argv[]) std::println("\n\n{:*^40}\n", " FITTED DIFFS "); for (size_t i = 0; i < pcm_cstr.numberOfPoints(); ++i) { - std::println("{} {} {} {:6.2f}% {} {} {:6.2f}%", i, MccAngleFancyString(tab.colon_res[i]), - MccAngleFancyString(r.model_colon[i]), std::abs(r.colon_res[i] / tab.colon_res[i]) * 100.0, + std::println("{} {} {} {:6.2f}% {} {} {:6.2f}% (HA = {} DEC = {})", i, + MccAngleFancyString(tab.colon_res[i]), MccAngleFancyString(r.model_colon[i]), + std::abs((tab.colon_res[i] - r.model_colon[i]) / tab.colon_res[i]) * 100.0, MccAngleFancyString(tab.colat_res[i]), MccAngleFancyString(r.model_colat[i]), - std::abs(r.colat_res[i] / tab.colat_res[i]) * 100.0); + std::abs((tab.colat_res[i] - r.model_colat[i]) / tab.colat_res[i]) * 100.0, + MccAngle(tab.hw_colon[i]).sexagesimal(true), MccAngle(tab.hw_colat[i]).sexagesimal()); }