AxioDL
/
amuse
mirror of https://github.com/AxioDL/amuse.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #40 from lioncash/const 

Studio: Make _cyclicCheck a const member function
This commit is contained in:
Phillip Stephens 2019-09-10 23:53:19 -07:00 committed by GitHub
parent 95ffcc2d16 b92674e127
commit 0dca047352
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/amuse/Studio.hpp
View File

@ -18,7 +18,7 @@ class Studio {
std::list<StudioSend> m_studiosOut;
#ifndef NDEBUG
bool _cyclicCheck(Studio* leaf);
bool _cyclicCheck(const Studio* leaf) const;
#endif
public:

16
lib/Studio.cpp
View File

@ -1,16 +1,16 @@
#include "amuse/Studio.hpp"
#include <algorithm>
#include "amuse/Engine.hpp"
namespace amuse {
#ifndef NDEBUG
bool Studio::_cyclicCheck(Studio* leaf) {
for (auto it = m_studiosOut.begin(); it != m_studiosOut.end();) {
if (leaf == it->m_targetStudio.get() || it->m_targetStudio->_cyclicCheck(leaf))
return true;
++it;
}
return false;
bool Studio::_cyclicCheck(const Studio* leaf) const {
return std::any_of(m_studiosOut.cbegin(), m_studiosOut.cend(), [leaf](const auto& studio) {
return leaf == studio.m_targetStudio.get() || studio.m_targetStudio->_cyclicCheck(leaf);
});
}
#endif
@ -20,7 +20,7 @@ Studio::Studio(Engine& engine, bool mainOut) : m_engine(engine), m_master(engine
}
void Studio::addStudioSend(ObjToken<Studio> studio, float dry, float auxA, float auxB) {
m_studiosOut.emplace_back(studio, dry, auxA, auxB);
m_studiosOut.emplace_back(std::move(studio), dry, auxA, auxB);
/* Cyclic check */
assert(!_cyclicCheck(this));