naming cleanup: rename scoring "Tier1"s to "W1"s (short for "Window 1")

add Preference1D so that we can index into the grading and life values
This commit is contained in:
Chris Danford
2005-10-09 04:30:59 +00:00
parent 2264d09032
commit feb1bfb0fc
44 changed files with 767 additions and 698 deletions
+7 -10
View File
@@ -40,8 +40,14 @@ Grade StringToGrade( const CString &sGrade )
CString s = sGrade;
s.MakeUpper();
// new style
int iTier;
if( sscanf(sGrade.c_str(),"Tier%02d",&iTier) == 1 ) return (Grade)(iTier-1);
else if( s == "FAILED" ) return Grade_Failed;
else if( s == "NODATA" ) return Grade_NoData;
// for backward compatibility
if ( s == "AAAA" ) return Grade_Tier01;
else if( s == "AAAA" ) return Grade_Tier01;
else if( s == "AAA" ) return Grade_Tier02;
else if( s == "AA" ) return Grade_Tier03;
else if( s == "A" ) return Grade_Tier04;
@@ -51,15 +57,6 @@ Grade StringToGrade( const CString &sGrade )
else if( s == "E" ) return Grade_Failed;
else if( s == "N" ) return Grade_NoData;
// new style
if ( s == "FAILED" ) return Grade_Failed;
else if( s == "NODATA" ) return Grade_NoData;
int iTier;
if( sscanf(sGrade.c_str(),"Tier%02d",&iTier) == 1 )
return (Grade)(iTier-1);
LOG->Warn( "Invalid grade: %s", sGrade.c_str() );
return Grade_NoData;
};