Skip to content

Improve error messages. #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DavidEGrayson wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Improve error messages. #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions perfaware/part4/listing_0172_reference_haversine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ struct haversine_setup
haversine_pair *Pairs;
f64 *Answers;

f64 SumAnswer;
f64 AverageAnswer;

b32 Valid;
};
Expand Down Expand Up @@ -166,14 +166,19 @@ static haversine_setup SetUpHaversine(char *PairsJSONFileName, char *AnswerFileN
{
Result.PairCount = PairCount;
Result.Answers = (f64 *)Result.AnswerBuffer.Data;
Result.SumAnswer = Result.Answers[PairCount];
Result.AverageAnswer = Result.Answers[PairCount];

Result.ParsedByteCount = (sizeof(haversine_pair)*Result.PairCount);

u64 Megabyte = 1024*1024;
fprintf(stdout, "Source JSON: %llumb\n", Result.JSONBuffer.Count/Megabyte);
fprintf(stdout, "Parsed: %llumb (%llu pairs)\n", Result.ParsedByteCount/Megabyte, Result.PairCount);

if (Result.PairCount == 0)
{
fprintf(stderr, "ERROR: Test data is empty.\n");
}

Result.Valid = (Result.PairCount != 0);
}
else
Expand Down
20 changes: 12 additions & 8 deletions perfaware/part4/listing_0173_reference_haversine_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ int main(int ArgCount, char **Args)
repetition_test_series TestSeries = AllocateTestSeries(ArrayCount(TestFunctions), 1);
if(IsValid(Setup) && IsValid(TestSeries))
{
f64 ReferenceSum = Setup.SumAnswer;
f64 AverageAnswer = Setup.AverageAnswer;

SetRowLabelLabel(&TestSeries, "Test");
SetRowLabel(&TestSeries, "Haversine");
Expand All @@ -82,7 +82,8 @@ int main(int ArgCount, char **Args)
NewTestWave(&TestSeries, &Tester, Setup.ParsedByteCount, GetCPUTimerFreq());

u64 IndividualErrorCount = Function.Verify(Setup);
u64 SumErrorCount = {};
u64 AverageErrorCount = {};
u64 Iterations = 0;

while(IsTesting(&TestSeries, &Tester))
{
Expand All @@ -91,29 +92,32 @@ int main(int ArgCount, char **Args)
CountBytes(&Tester, Setup.ParsedByteCount);
EndTime(&Tester);

SumErrorCount += !ApproxAreEqual(Check, ReferenceSum);
AverageErrorCount += !ApproxAreEqual(Check, AverageAnswer);
}

if(SumErrorCount || IndividualErrorCount)
if(AverageErrorCount || IndividualErrorCount)
{
fprintf(stderr, "WARNING: %llu haversines mismatched, %llu sum mismatches\n",
IndividualErrorCount, SumErrorCount);
fprintf(stderr, "WARNING: %llu haversines mismatched, %llu averages mismatched (%llu iterations)\n",
IndividualErrorCount, AverageErrorCount, Iterations);
}
}

PrintCSVForValue(&TestSeries, StatValue_GBPerSecond, stdout);
}
else
{
fprintf(stderr, "ERROR: Test data size must be non-zero\n");
fprintf(stderr, "ERROR: Test data invalid.\n");
}

FreeHaversine(&Setup);
FreeTestSeries(&TestSeries);
}
else
{
fprintf(stderr, "Usage: %s [existing filename]\n", Args[0]);
fprintf(stderr, "Usage: %s PAIRS ANSWERS\n"
"where PAIRS is an existing JSON file with N coordinate pairs\n"
"and ANSWERS is an existing binary answers file with N haversine distances\n"
"followed by the average distance (8-byte floats).\n", Args[0]);
}

return 0;
Expand Down