actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

optimization experiment

Browse Source
This commit is contained in:
Glenn Maynard
2003-12-12 04:40:35 +00:00
parent b018828250
commit 2e7f153d95
1 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Song.cpp
+28 -23
View File
@@ -1387,40 +1387,45 @@ void SortSongPointerArrayByBPM( vector<Song*> &arraySongPointers )
sort( arraySongPointers.begin(), arraySongPointers.end(), CompareSongPointersByBPM ); sort( arraySongPointers.begin(), arraySongPointers.end(), CompareSongPointersByBPM );
} }
struct GradeCnt { int n[NUM_GRADES]; }; void AppendOctal( int n, int digits, CString &out )
static map<Song *, GradeCnt> NumNotesWithGrade;
bool CompareSongPointersByGrade(const Song *pSong1, const Song *pSong2)
{ {
const GradeCnt &cnt1=NumNotesWithGrade[(Song *) pSong1]; for( int p = digits; p >= 0; --p )
const GradeCnt &cnt2=NumNotesWithGrade[(Song *) pSong2];
for( int i=NUM_GRADES-1; i>GRADE_NO_DATA; i-- )
{ {
const int iCount1 = cnt1.n[i]; const int shift = p*3;
const int iCount2 = cnt2.n[i]; int n2 = (n >> shift) & 0x7;
out.push_back( (char) n2 );
if( iCount1 > iCount2 )
return true;
if( iCount1 < iCount2 )
return false;
} }
return CompareSongPointersByTitle( pSong1, pSong2 );
} }
bool CompDescending( const pair<Song *, CString> &a, const pair<Song *, CString> &b )
{ return a.second > b.second; }
void SortSongPointerArrayByGrade( vector<Song*> &arraySongPointers ) void SortSongPointerArrayByGrade( vector<Song*> &arraySongPointers )
{ {
for(unsigned i = 0; i < arraySongPointers.size(); ++i) /* Optimize by pre-writing a string to compare, since doing GetNumNotesWithGrade
{ * inside the sort is too slow. */
GradeCnt cnt; typedef pair< Song *, CString > val;
memset( cnt.n, 0, sizeof(cnt.n) ); vector<val> vals;
vals.reserve( arraySongPointers.size() );
for( unsigned i = 0; i < arraySongPointers.size(); ++i )
{
Song *pSong = arraySongPointers[i]; Song *pSong = arraySongPointers[i];
CString foo;
foo.reserve(256);
for( int g=NUM_GRADES-1; g>GRADE_NO_DATA; g-- ) for( int g=NUM_GRADES-1; g>GRADE_NO_DATA; g-- )
cnt.n[g] = pSong->GetNumNotesWithGrade( (Grade)g ); {
NumNotesWithGrade[pSong] = cnt; int n = pSong->GetNumNotesWithGrade( (Grade)g );
AppendOctal( n, 3, foo );
}
vals.push_back( val(pSong, foo) );
} }
sort( arraySongPointers.begin(), arraySongPointers.end(), CompareSongPointersByGrade );
sort( vals.begin(), vals.end(), CompDescending );
for( unsigned i = 0; i < arraySongPointers.size(); ++i )
arraySongPointers[i] = vals[i].first;
} }