Skip to content

Commit

Permalink
remove couples/routines radar value functions
Browse files Browse the repository at this point in the history
  • Loading branch information
@MinaciousGrace
MinaciousGrace committed May 26, 2020
1 parent 716342f commit 0be9200
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 188 deletions.
160 changes: 0 additions & 160 deletions src/Etterna/Models/NoteData/NoteData.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -856,25 +856,6 @@ NoteData::IsPlayer1(const int track, const TapNote& tn) const
return track < (this->GetNumTracks() / 2);
}

pair<int, int>
NoteData::GetNumTapNotesTwoPlayer(int iStartIndex, int iEndIndex) const
{
pair<int, int> num(0, 0);
for (int t = 0; t < GetNumTracks(); t++) {
FOREACH_NONEMPTY_ROW_IN_TRACK_RANGE(*this, t, r, iStartIndex, iEndIndex)
{
const TapNote& tn = GetTapNote(t, r);
if (this->IsTap(tn, r)) {
if (this->IsPlayer1(t, tn))
num.first++;
else
num.second++;
}
}
}
return num;
}

pair<int, int>
NoteData::GetNumRowsWithSimultaneousTapsTwoPlayer(int minTaps,
int startRow,
Expand All @@ -901,147 +882,6 @@ NoteData::GetNumRowsWithSimultaneousTapsTwoPlayer(int minTaps,
return num;
}

pair<int, int>
NoteData::GetNumJumpsTwoPlayer(int iStartIndex, int iEndIndex) const
{
return GetNumRowsWithSimultaneousTapsTwoPlayer(2, iStartIndex, iEndIndex);
}

pair<int, int>
NoteData::GetNumHandsTwoPlayer(int iStartIndex, int iEndIndex) const
{
return GetNumRowsWithSimultaneousTapsTwoPlayer(3, iStartIndex, iEndIndex);
}

pair<int, int>
NoteData::GetNumQuadsTwoPlayer(int iStartIndex, int iEndIndex) const
{
return GetNumRowsWithSimultaneousTapsTwoPlayer(4, iStartIndex, iEndIndex);
}

pair<int, int>
NoteData::GetNumHoldNotesTwoPlayer(int iStartIndex, int iEndIndex) const
{
pair<int, int> num(0, 0);
for (int t = 0; t < GetNumTracks(); ++t) {
NoteData::TrackMap::const_iterator lBegin, lEnd;
GetTapNoteRangeExclusive(t, iStartIndex, iEndIndex, lBegin, lEnd);
for (; lBegin != lEnd; ++lBegin) {
if (lBegin->second.type != TapNoteType_HoldHead ||
lBegin->second.subType != TapNoteSubType_Hold)
continue;
if (!GAMESTATE->GetProcessedTimingData()->IsJudgableAtRow(
lBegin->first))
continue;
if (this->IsPlayer1(t, lBegin->second))
num.first++;
else
num.second++;
}
}
return num;
}

pair<int, int>
NoteData::GetNumMinesTwoPlayer(int iStartIndex, int iEndIndex) const
{
pair<int, int> num(0, 0);
for (int t = 0; t < GetNumTracks(); t++) {
FOREACH_NONEMPTY_ROW_IN_TRACK_RANGE(*this, t, r, iStartIndex, iEndIndex)
{
const TapNote& tn = GetTapNote(t, r);
if (this->IsMine(tn, r)) {
if (this->IsPlayer1(t, tn))
num.first++;
else
num.second++;
}
}
}
return num;
}

pair<int, int>
NoteData::GetNumRollsTwoPlayer(int iStartIndex, int iEndIndex) const
{
pair<int, int> num(0, 0);
for (int t = 0; t < GetNumTracks(); ++t) {
NoteData::TrackMap::const_iterator lBegin, lEnd;
GetTapNoteRangeExclusive(t, iStartIndex, iEndIndex, lBegin, lEnd);
for (; lBegin != lEnd; ++lBegin) {
if (lBegin->second.type != TapNoteType_HoldHead ||
lBegin->second.subType != TapNoteSubType_Roll)
continue;
if (!GAMESTATE->GetProcessedTimingData()->IsJudgableAtRow(
lBegin->first))
continue;
if (this->IsPlayer1(t, lBegin->second))
num.first++;
else
num.second++;
}
}
return num;
}

pair<int, int>
NoteData::GetNumLiftsTwoPlayer(int iStartIndex, int iEndIndex) const
{
pair<int, int> num(0, 0);
for (int t = 0; t < GetNumTracks(); t++) {
FOREACH_NONEMPTY_ROW_IN_TRACK_RANGE(*this, t, r, iStartIndex, iEndIndex)
{
const TapNote& tn = GetTapNote(t, r);
if (this->IsLift(tn, r)) {
if (this->IsPlayer1(t, tn))
num.first++;
else
num.second++;
}
}
}
return num;
}

pair<int, int>
NoteData::GetNumFakesTwoPlayer(int iStartIndex, int iEndIndex) const
{
pair<int, int> num(0, 0);
for (int t = 0; t < GetNumTracks(); t++) {
FOREACH_NONEMPTY_ROW_IN_TRACK_RANGE(*this, t, r, iStartIndex, iEndIndex)
{
const TapNote& tn = GetTapNote(t, r);
if (this->IsFake(tn, r)) {
if (this->IsPlayer1(t, tn))
num.first++;
else
num.second++;
}
}
}
return num;
}

/*
int NoteData::GetNumMinefields( int iStartIndex, int iEndIndex ) const
{
int iNumMinefields = 0;
for( int t=0; t<GetNumTracks(); ++t )
{
NoteData::TrackMap::const_iterator begin, end;
GetTapNoteRangeExclusive( t, iStartIndex, iEndIndex, begin, end );
for( ; begin != end; ++begin )
{
if( begin->second.type != TapNoteType_HoldHead ||
begin->second.subType != TapNoteSubType_mine )
continue;
iNumMinefields++;
}
}
return iNumMinefields;
}
*/

// This is a fast but inaccurate LCD calculator.
// Used for generating accurate DP scores when
// chord cohesion is disabled.
Expand Down
28 changes: 0 additions & 28 deletions src/Etterna/Models/NoteData/NoteData.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -508,34 +508,6 @@ class NoteData
int GetNumLifts(int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW) const;
int GetNumFakes(int iStartIndex = 0, int iEndIndex = MAX_NOTE_ROW) const;

// the couple/routine style variants of the above.
pair<int, int> GetNumTapNotesTwoPlayer(int startRow = 0,
int endRow = MAX_NOTE_ROW) const;

pair<int, int> GetNumJumpsTwoPlayer(int startRow = 0,
int endRow = MAX_NOTE_ROW) const;

pair<int, int> GetNumHandsTwoPlayer(int startRow = 0,
int endRow = MAX_NOTE_ROW) const;

pair<int, int> GetNumQuadsTwoPlayer(int startRow = 0,
int endRow = MAX_NOTE_ROW) const;

pair<int, int> GetNumHoldNotesTwoPlayer(int startRow = 0,
int endRow = MAX_NOTE_ROW) const;

pair<int, int> GetNumMinesTwoPlayer(int startRow = 0,
int endRow = MAX_NOTE_ROW) const;

pair<int, int> GetNumRollsTwoPlayer(int startRow = 0,
int endRow = MAX_NOTE_ROW) const;

pair<int, int> GetNumLiftsTwoPlayer(int startRow = 0,
int endRow = MAX_NOTE_ROW) const;

pair<int, int> GetNumFakesTwoPlayer(int startRow = 0,
int endRow = MAX_NOTE_ROW) const;

int GetNumTracksLCD() const;

// Transformations
Expand Down

0 comments on commit 0be9200

Please sign in to comment.