options name cleanup, fixes

This commit is contained in:
Chris Danford
2004-01-20 07:09:44 +00:00
parent 42e0413e0f
commit c8fc9ddeae
11 changed files with 348 additions and 338 deletions
+27 -8
View File
@@ -21,7 +21,25 @@ CString GradeToString( Grade g )
case GRADE_NO_DATA: return "NoData";
case GRADE_FAILED: return "Failed";
default:
return ssprintf("%02d",g);
return ssprintf("%02d",g+1);
}
};
CString GradeToOldString( Grade g )
{
// string is meant to be human readable
switch( g )
{
case GRADE_TIER_1: return "AAAA";
case GRADE_TIER_2: return "AAA";
case GRADE_TIER_3: return "AA";
case GRADE_TIER_4: return "A";
case GRADE_TIER_5: return "B";
case GRADE_TIER_6: return "C";
case GRADE_TIER_7: return "D";
case GRADE_FAILED: return "E";
case GRADE_NO_DATA: return "N";
default: return "N";
}
};
@@ -30,7 +48,7 @@ Grade StringToGrade( const CString &sGrade )
CString s = sGrade;
s.MakeUpper();
// letters for backward compatibility
// for backward compatibility
if ( s == "AAAA" ) return GRADE_TIER_1;
else if( s == "AAA" ) return GRADE_TIER_2;
else if( s == "AA" ) return GRADE_TIER_3;
@@ -39,16 +57,17 @@ Grade StringToGrade( const CString &sGrade )
else if( s == "C" ) return GRADE_TIER_6;
else if( s == "D" ) return GRADE_TIER_7;
else if( s == "E" ) return GRADE_FAILED;
else if( s == "FAILED" ) return GRADE_FAILED;
else if( s == "N" ) return GRADE_NO_DATA;
// new style
if ( s == "FAILED" ) return GRADE_FAILED;
else if( s == "NODATA" ) return GRADE_NO_DATA;
#define MY_IS_DIGIT( c ) (c>='0'&&c<='9')
// If the string is a two digit number...
if( s.length()==2 && MY_IS_DIGIT(s[0]) && MY_IS_DIGIT(s[1]) )
{
return (Grade)atoi(s);
}
if( s.length()==2 && MY_IS_DIGIT(s[0]) && MY_IS_DIGIT(s[1]) ) // if it's a two digit number...
return (Grade)(atoi(s)-1);
ASSERT(0);
return GRADE_NO_DATA;