UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-22 07:10:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

[shared] Fix storage_function_store without template

Browse Source
This commit is contained in:
Émilie Feral
2018-10-10 16:45:14 +02:00
parent f3c4abe1c2
commit 8ec6673aee
3 changed files with 30 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
apps/shared/storage_function_store.cpp
View File

@@ -4,59 +4,41 @@
namespace Shared {
template<class T>
int StorageFunctionStore<T>::numberOfActiveFunctions() {
uint32_t StorageFunctionStore::storeChecksum() {
return Ion::Storage::sharedStorage()->checksum();
}
int StorageFunctionStore::numberOfActiveFunctions() const {
int result = 0;
int modelsCount = StorageExpressionModelStore<T>::numberOfModels();
for (int i = 0; i < modelsCount; i++) {
T function = StorageExpressionModelStore<T>::modelAtIndex(i);
if (function.isDefined() && function.isActive()) {
int i = 0;
StorageFunction * function = modelAtIndex(i++);
while (!function->isNull()) {
if (function->isDefined() && function->isActive()) {
result++;
}
function = modelAtIndex(i++);
}
return result;
}
template<class T>
T StorageFunctionStore<T>::activeFunctionAtIndex(int i) {
assert(i >= 0 && i < numberOfActiveFunctions());
StorageFunction * StorageFunctionStore::activeFunctionAtIndex(int i) {
assert(i >= 0 && i < numberOfDefinedModels());
int index = 0;
int modelsCount = StorageExpressionModelStore<T>::numberOfModels();
for (int k = 0; k < modelsCount; k++) {
T function = StorageExpressionModelStore<T>::modelAtIndex(k);
if (function.isActive() && function.isDefined()) {
int currentModelIndex = 0;
StorageFunction * function = modelAtIndex(currentModelIndex++);
while (!function->isNull()) {
assert(currentModelIndex < numberOfModels());
if (function->isActive() && function->isDefined()) {
if (i == index) {
return function;
}
index++;
}
function = modelAtIndex(currentModelIndex++);
}
assert(false);
return nullptr;
}
template<class T>
template<typename U>
U StorageFunctionStore<T>::firstAvailableAttribute(U attributes[], AttributeGetter<U> attribute) {
int modelsCount = StorageExpressionModelStore<T>::numberOfModels();
for (int k = 0; k < 4/*TODO*/; k++) {
int j = 0;
while (j < modelsCount) {
if (attribute(StorageExpressionModelStore<T>::modelAtIndex(j)) == attributes[k]) {
break;
}
j++;
}
if (j == modelsCount) {
return attributes[k];
}
}
return attributes[0];
}
}
//TODO specify templates
template class Shared::StorageFunctionStore<Shared::StorageCartesianFunction>;
/*template char const* const Shared::StorageFunctionStore::firstAvailableAttribute<char const* const>(char const* const*, char const* const (*)(Shared::StorageFunction));
template KDColor const Shared::StorageFunctionStore::firstAvailableAttribute<KDColor const>(KDColor const*, KDColor const (*)(Shared::StorageFunction));*/