stepan
/
dynare
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Dynare++ tensor library: small simplification

time-shift
Sébastien Villemot 2019-01-31 17:58:54 +01:00
parent 342e8c7508
commit 566d237ec3
No known key found for this signature in database
GPG Key ID: 2CECE9350ECEBE4A
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dynare++/tl/cc/equivalence.cc
View File

@ -400,13 +400,6 @@ EquivalenceBundle::EquivalenceBundle(int nmax)
generateUpTo(nmax);
}
/* Destruct bundle. Just free all pointers. */
EquivalenceBundle::~EquivalenceBundle()
{
for (auto & i : bundle)
delete i;
}
/* Remember, that the first item is |EquivalenceSet(1)|. */
const EquivalenceSet &
EquivalenceBundle::get(int n) const
@ -414,11 +407,11 @@ EquivalenceBundle::get(int n) const
if (n > (int) (bundle.size()) || n < 1)
{
TL_RAISE("Equivalence set not found in EquivalenceBundle::get");
return *(bundle[0]);
return bundle[0];
}
else
{
return *(bundle[n-1]);
return bundle[n-1];
}
}
@ -430,5 +423,5 @@ EquivalenceBundle::generateUpTo(int nmax)
{
int curmax = bundle.size();
for (int i = curmax+1; i <= nmax; i++)
bundle.push_back(new EquivalenceSet(i));
bundle.emplace_back(i);
}

4
dynare++/tl/cc/equivalence.hh
View File

@ -212,10 +212,10 @@ private:
class EquivalenceBundle
{
vector<EquivalenceSet *> bundle;
vector<EquivalenceSet> bundle;
public:
EquivalenceBundle(int nmax);
~EquivalenceBundle();
~EquivalenceBundle() = default;
const EquivalenceSet&get(int n) const;
void generateUpTo(int nmax);
};