Skip to content

Commit 9efd6dd

Browse files
rogerfraserrogerfraser
committed
Correct method names
1 parent e50c1ba commit 9efd6dd

File tree

3 files changed

+37
-37
lines changed

3 files changed

+37
-37
lines changed

‎dynadjust/dynadjust/dnaadjust/dnaadjust_printer.cpp‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,9 @@ void DynAdjustPrinter::PrintAdjMeasurements<LinearMeasurement>(
140140
PrintAdjMeasurementStatistics(cardinal, it_msr, initialise_dbindex);
141141
}
142142

143-
// Template specializations for comparative measurements
143+
// Template specializations for computed measurements
144144
template<>
145-
void DynAdjustPrinter::PrintComparativeMeasurements<AngularMeasurement>(
145+
void DynAdjustPrinter::PrintComputedMeasurements<AngularMeasurement>(
146146
char cardinal, const double& computed, const double& correction, const it_vmsr_t& it_msr) {
147147
// Print computed angular measurements
148148
PrintMeasurementValue<AngularMeasurement>(cardinal, computed, correction, it_msr, false);
@@ -159,7 +159,7 @@ void DynAdjustPrinter::PrintComparativeMeasurements<AngularMeasurement>(
159159
}
160160

161161
template<>
162-
void DynAdjustPrinter::PrintComparativeMeasurements<LinearMeasurement>(
162+
void DynAdjustPrinter::PrintComputedMeasurements<LinearMeasurement>(
163163
char cardinal, const double& computed, const double& correction, const it_vmsr_t& it_msr) {
164164
// Check if adjustment is questionable for linear measurements
165165
if (!adjust_.isAdjustmentQuestionable_) {
@@ -183,12 +183,12 @@ void DynAdjustPrinter::PrintComparativeMeasurements<LinearMeasurement>(
183183
// Compatibility methods for maintaining the original method names
184184
void DynAdjustPrinter::PrintCompMeasurementsLinear(const char cardinal, const double& computed,
185185
const double& correction, const it_vmsr_t& it_msr) {
186-
PrintComparativeMeasurements<LinearMeasurement>(cardinal, computed, correction, it_msr);
186+
PrintComputedMeasurements<LinearMeasurement>(cardinal, computed, correction, it_msr);
187187
}
188188

189189
void DynAdjustPrinter::PrintCompMeasurementsAngular(const char cardinal, const double& computed,
190190
const double& correction, const it_vmsr_t& it_msr) {
191-
PrintComparativeMeasurements<AngularMeasurement>(cardinal, computed, correction, it_msr);
191+
PrintComputedMeasurements<AngularMeasurement>(cardinal, computed, correction, it_msr);
192192
}
193193

194194
void DynAdjustPrinter::PrintMeasurementsAngular(const char cardinal, const double& measurement,
@@ -844,7 +844,7 @@ void DynAdjustPrinter::PrintCompMeasurements_D(it_vmsr_t& _it_msr, UINT32& desig
844844

845845
// Print angular measurement, taking care of user requirements for
846846
// type, format and precision
847-
PrintComparativeMeasurements<AngularMeasurement>(' ', computed, _it_msr->measCorr, _it_msr);
847+
PrintComputedMeasurements<AngularMeasurement>(' ', computed, _it_msr->measCorr, _it_msr);
848848

849849
design_row++;
850850
_it_msr++;
@@ -1025,22 +1025,22 @@ void DynAdjustPrinter::PrintCompMeasurements_YLLH(it_vmsr_t& _it_msr, UINT32& de
10251025
std::left << std::setw(STATION) << " "; // third station
10261026

10271027
// Print latitude
1028-
PrintComparativeMeasurements<AngularMeasurement>('P', _it_y_msr->measAdj, _it_y_msr->measCorr, _it_y_msr);
1028+
PrintComputedMeasurements<AngularMeasurement>('P', _it_y_msr->measAdj, _it_y_msr->measCorr, _it_y_msr);
10291029

10301030
// Print longitude
10311031
_it_y_msr++;
1032-
PrintComparativeMeasurements<AngularMeasurement>('L', _it_y_msr->measAdj, _it_y_msr->measCorr, _it_y_msr);
1032+
PrintComputedMeasurements<AngularMeasurement>('L', _it_y_msr->measAdj, _it_y_msr->measCorr, _it_y_msr);
10331033

10341034
// Print height
10351035
_it_y_msr++;
10361036
switch (_it_msr->station3)
10371037
{
10381038
case LLh_type_i:
1039-
PrintComparativeMeasurements<LinearMeasurement>('h', _it_y_msr->measAdj, _it_y_msr->measCorr, _it_y_msr);
1039+
PrintComputedMeasurements<LinearMeasurement>('h', _it_y_msr->measAdj, _it_y_msr->measCorr, _it_y_msr);
10401040
break;
10411041
case LLH_type_i:
10421042
default:
1043-
PrintComparativeMeasurements<LinearMeasurement>('H', _it_y_msr->measAdj, _it_y_msr->measCorr, _it_y_msr);
1043+
PrintComputedMeasurements<LinearMeasurement>('H', _it_y_msr->measAdj, _it_y_msr->measCorr, _it_y_msr);
10441044
break;
10451045
}
10461046

@@ -1075,7 +1075,7 @@ void DynAdjustPrinter::PrintCompMeasurements_A(const UINT32& block, it_vmsr_t& _
10751075

10761076
// Print angular measurement, taking care of user requirements for
10771077
// type, format and precision
1078-
PrintComparativeMeasurements<AngularMeasurement>(' ', computed, correction, _it_msr);
1078+
PrintComputedMeasurements<AngularMeasurement>(' ', computed, correction, _it_msr);
10791079

10801080
design_row++;
10811081
}
@@ -1102,7 +1102,7 @@ void DynAdjustPrinter::PrintCompMeasurements_BKVZ(const UINT32& block, it_vmsr_t
11021102

11031103
// Print angular measurement, taking care of user requirements for
11041104
// type, format and precision
1105-
PrintComparativeMeasurements<AngularMeasurement>(' ', computed, correction, _it_msr);
1105+
PrintComputedMeasurements<AngularMeasurement>(' ', computed, correction, _it_msr);
11061106

11071107
design_row++;
11081108
}
@@ -3622,7 +3622,7 @@ void DynAdjustPrinter::PrintCompMeasurements_GXY(const UINT32& block, it_vmsr_t&
36223622
}
36233623

36243624
// Print linear measurement, taking care of user requirements for precision
3625-
PrintComparativeMeasurements<LinearMeasurement>('X', computed, correction, _it_msr);
3625+
PrintComputedMeasurements<LinearMeasurement>('X', computed, correction, _it_msr);
36263626

36273627
design_row++;
36283628
_it_msr++;
@@ -3641,7 +3641,7 @@ void DynAdjustPrinter::PrintCompMeasurements_GXY(const UINT32& block, it_vmsr_t&
36413641
}
36423642

36433643
// Print linear measurement, taking care of user requirements for precision
3644-
PrintComparativeMeasurements<LinearMeasurement>('Y', computed, correction, _it_msr);
3644+
PrintComputedMeasurements<LinearMeasurement>('Y', computed, correction, _it_msr);
36453645

36463646
design_row++;
36473647
_it_msr++;
@@ -3660,7 +3660,7 @@ void DynAdjustPrinter::PrintCompMeasurements_GXY(const UINT32& block, it_vmsr_t&
36603660
}
36613661

36623662
// Print linear measurement, taking care of user requirements for precision
3663-
PrintComparativeMeasurements<LinearMeasurement>('Z', computed, correction, _it_msr);
3663+
PrintComputedMeasurements<LinearMeasurement>('Z', computed, correction, _it_msr);
36643664

36653665
design_row++;
36663666

@@ -4815,7 +4815,7 @@ void DynAdjustPrinter::PrintCompMeasurements_HR(const UINT32& block, it_vmsr_t&
48154815
}
48164816

48174817
// Print linear measurement, taking care of user requirements for precision
4818-
PrintComparativeMeasurements<LinearMeasurement>(' ', computed, correction, _it_msr);
4818+
PrintComputedMeasurements<LinearMeasurement>(' ', computed, correction, _it_msr);
48194819

48204820
design_row++;
48214821
}
@@ -4844,7 +4844,7 @@ void DynAdjustPrinter::PrintCompMeasurements_IJPQ(const UINT32& block, it_vmsr_t
48444844

48454845
// Print angular measurement, taking care of user requirements for
48464846
// type, format and precision
4847-
PrintComparativeMeasurements<AngularMeasurement>(' ', computed, correction, _it_msr);
4847+
PrintComputedMeasurements<AngularMeasurement>(' ', computed, correction, _it_msr);
48484848

48494849
design_row++;
48504850
}

‎dynadjust/dynadjust/dnaadjust/dnaadjust_printer.hpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,9 @@ class DNAADJUST_API DynAdjustPrinter {
104104
template <typename MeasurementType>
105105
void PrintAdjMeasurements(char cardinal, const it_vmsr_t& it_msr, bool initialise_dbindex = true);
106106

107-
// Template-based comparative measurement printing
107+
// Template-based computed measurement printing
108108
template <typename MeasurementType>
109-
void PrintComparativeMeasurements(char cardinal, const double& computed, const double& correction, const it_vmsr_t& it_msr);
109+
void PrintComputedMeasurements(char cardinal, const double& computed, const double& correction, const it_vmsr_t& it_msr);
110110

111111
// Compatibility methods - delegate to template implementations
112112
void PrintCompMeasurementsLinear(const char cardinal, const double& computed, const double& correction, const it_vmsr_t& it_msr);
@@ -305,7 +305,7 @@ void DynAdjustPrinter::PrintAdjMeasurements(char cardinal, const it_vmsr_t& it_m
305305
}
306306

307307
template <typename MeasurementType>
308-
void DynAdjustPrinter::PrintComparativeMeasurements(char cardinal, const double& computed, const double& correction, const it_vmsr_t& it_msr) {
308+
void DynAdjustPrinter::PrintComputedMeasurements(char cardinal, const double& computed, const double& correction, const it_vmsr_t& it_msr) {
309309
// Default implementation - will be replaced by explicit specializations
310310
static_assert(sizeof(MeasurementType) == 0, "Must use specialization");
311311
}
@@ -335,11 +335,11 @@ void DynAdjustPrinter::PrintAdjMeasurements<LinearMeasurement>(char cardinal, co
335335
bool initialise_dbindex);
336336

337337
template <>
338-
void DynAdjustPrinter::PrintComparativeMeasurements<AngularMeasurement>(char cardinal, const double& computed,
338+
void DynAdjustPrinter::PrintComputedMeasurements<AngularMeasurement>(char cardinal, const double& computed,
339339
const double& correction, const it_vmsr_t& it_msr);
340340

341341
template <>
342-
void DynAdjustPrinter::PrintComparativeMeasurements<LinearMeasurement>(char cardinal, const double& computed,
342+
void DynAdjustPrinter::PrintComputedMeasurements<LinearMeasurement>(char cardinal, const double& computed,
343343
const double& correction, const it_vmsr_t& it_msr);
344344

345345
// Stage 4: Station coordinate formatting specializations

‎tests/test_dnaadjust_printer_simple.cpp‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -117,14 +117,14 @@ class TestPrinter {
117117
adjust_.PrintAdjMeasurementStatistics(cardinal, it_msr, initialise_dbindex);
118118
}
119119

120-
// New Stage 2 functions for comparative measurements
121-
void print_comparative_angular_measurement(char cardinal, double computed, double correction, const it_vmsr_t& it_msr) {
122-
adjust_.adj_file << "Comparative angular measurement: " << computed << " ";
120+
// New Stage 2 functions for computed measurements
121+
void print_computed_angular_measurement(char cardinal, double computed, double correction, const it_vmsr_t& it_msr) {
122+
adjust_.adj_file << "Computed angular measurement: " << computed << " ";
123123
adjust_.adj_file << "Correction: " << correction << " ";
124124
}
125125

126-
void print_comparative_linear_measurement(char cardinal, double computed, double correction, const it_vmsr_t& it_msr) {
127-
adjust_.adj_file << "Comparative linear measurement: " << computed << " ";
126+
void print_computed_linear_measurement(char cardinal, double computed, double correction, const it_vmsr_t& it_msr) {
127+
adjust_.adj_file << "Computed linear measurement: " << computed << " ";
128128
adjust_.adj_file << "Correction: " << correction << " ";
129129
adjust_.adj_file << "Questionable: " << (fabs(correction) > 999.9999 ? "true" : "false") << " ";
130130
}
@@ -429,50 +429,50 @@ TEST_CASE("Printer demonstrates C++17 features", "[printer][modern]") {
429429
}
430430
}
431431

432-
TEST_CASE("Stage 2: Comparative measurement printing works correctly", "[printer][comparative]") {
433-
SECTION("Comparative angular measurement printing") {
432+
TEST_CASE("Stage 2: Computed measurement printing works correctly", "[printer][computed]") {
433+
SECTION("Computed angular measurement printing") {
434434
MockDnaAdjust mock_adjust;
435435
TestPrinter printer(mock_adjust);
436436

437437
vmsr_t measurements;
438438
measurements.push_back(createTestMeasurement('A'));
439439
it_vmsr_t it_msr = measurements.begin();
440440

441-
printer.print_comparative_angular_measurement(' ', 45.123, 0.001, it_msr);
441+
printer.print_computed_angular_measurement(' ', 45.123, 0.001, it_msr);
442442

443443
std::string output = mock_adjust.adj_file.str();
444-
REQUIRE(output.find("Comparative angular measurement: 45.123") != std::string::npos);
444+
REQUIRE(output.find("Computed angular measurement: 45.123") != std::string::npos);
445445
REQUIRE(output.find("Correction: 0.001") != std::string::npos);
446446
}
447447

448-
SECTION("Comparative linear measurement with large correction") {
448+
SECTION("Computed linear measurement with large correction") {
449449
MockDnaAdjust mock_adjust;
450450
TestPrinter printer(mock_adjust);
451451

452452
vmsr_t measurements;
453453
measurements.push_back(createTestMeasurement('C'));
454454
it_vmsr_t it_msr = measurements.begin();
455455

456-
printer.print_comparative_linear_measurement(' ', 1234.567, 1000.5, it_msr);
456+
printer.print_computed_linear_measurement(' ', 1234.567, 1000.5, it_msr);
457457

458458
std::string output = mock_adjust.adj_file.str();
459-
REQUIRE(output.find("Comparative linear measurement: 1234.57") != std::string::npos);
459+
REQUIRE(output.find("Computed linear measurement: 1234.57") != std::string::npos);
460460
REQUIRE(output.find("Correction: 1000.5") != std::string::npos);
461461
REQUIRE(output.find("Questionable: true") != std::string::npos);
462462
}
463463

464-
SECTION("Comparative linear measurement with small correction") {
464+
SECTION("Computed linear measurement with small correction") {
465465
MockDnaAdjust fresh_mock_adjust;
466466
TestPrinter fresh_printer(fresh_mock_adjust);
467467

468468
vmsr_t measurements;
469469
measurements.push_back(createTestMeasurement('C'));
470470
it_vmsr_t it_msr = measurements.begin();
471471

472-
fresh_printer.print_comparative_linear_measurement(' ', 1234.567, 0.5, it_msr);
472+
fresh_printer.print_computed_linear_measurement(' ', 1234.567, 0.5, it_msr);
473473

474474
std::string output = fresh_mock_adjust.adj_file.str();
475-
REQUIRE(output.find("Comparative linear measurement: 1234.57") != std::string::npos);
475+
REQUIRE(output.find("Computed linear measurement: 1234.57") != std::string::npos);
476476
REQUIRE(output.find("Correction: 0.5") != std::string::npos);
477477
REQUIRE(output.find("Questionable: false") != std::string::npos);
478478
}

0 commit comments

Comments
 (0)