Skip to content
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.

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

Add a check for FSA memory full #3

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions cpp/fsa.h
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,8 @@ template <class USER_TYPE> class FixedSizeAllocator
);
}

unsigned int GetMaxElementCount() { return m_MaxElements; };

public: // data

private: // methods
Expand Down
10 changes: 8 additions & 2 deletions cpp/stlastar.h
Original file line number Diff line number Diff line change
Expand Up @@ -197,10 +197,16 @@ template <class UserState> class AStarSearch
return m_State;
}

bool maxNodesReached = false;
#if USE_FSA_MEMORY
maxNodesReached = m_AllocateNodeCount >= m_FixedSizeAllocator.GetMaxElementCount();
#endif

// Failure is defined as emptying the open list as there is nothing left to
// search...
// New: Allow user abort
if( m_OpenList.empty() || m_CancelRequest )
// Allow user abort
// Check if FSA memory is full
if( m_OpenList.empty() || m_CancelRequest || maxNodesReached)
{
FreeAllNodes();
m_State = SEARCH_STATE_FAILED;
Expand Down