alex/cmc-finite-functions
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Current function state stored in vector

Browse Source
This commit is contained in:
Aleksey Lobanov
2018-04-26 02:34:08 +03:00
parent e66a81d649
commit 98bbd51a87
1 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
main.cpp
View File

@@ -26,9 +26,9 @@ const CellType CUR_BASE = 3;
const int ARGS_COUNT = 2;
struct FunctionTask {
set<FiniteFunction<CUR_BASE>> current;
bool is_finished;
vector<FiniteFunction<CUR_BASE>> current;
int current_max_coeff;
bool is_finished;
};
template <size_t BASE>
@@ -268,13 +268,13 @@ set<FiniteFunction<BASE>> generate_function_class(FiniteFunction<BASE> base_func
// Вторым результатом возвращает true, если вычисления закончились успешно
// и false, если прервались по достижению max_size
template <CellType BASE>
pair<set<FiniteFunction<BASE>>, bool> extend_function_class(
const set<FiniteFunction<BASE>>& base_class,
pair<vector<FiniteFunction<BASE>>, bool> extend_function_class(
const vector<FiniteFunction<BASE>>& base_class,
size_t max_size
) {
if ( base_class.size() >= max_size )
return make_pair(
set<FiniteFunction<BASE>>(base_class.begin(), base_class.end()),
vector<FiniteFunction<BASE>>(base_class.begin(), base_class.end()),
false
);
@@ -322,14 +322,15 @@ pair<set<FiniteFunction<BASE>>, bool> extend_function_class(
}
}
return make_pair(
set<FiniteFunction<BASE>>(func_class.begin(), func_class.end()),
vector<FiniteFunction<BASE>>(func_class.begin(), func_class.end()),
is_finished
);
}
template <class Iterable>
bool is_bad_class(
set<FiniteFunction<CUR_BASE>> func_class,
const Iterable& func_class,
const set<FiniteFunction<CUR_BASE>>& bad_funcs
) {
for (auto&& func: func_class)
@@ -401,6 +402,9 @@ void process_task_lists() {
continue;
}
task_mutex.lock();
if ( task_list.size() != 0 )
cout << "IMPOSSIBLE task_list.size!!" << endl;
task_list.clear();
task_list.shrink_to_fit();
task_mutex.unlock();
@@ -412,6 +416,11 @@ void process_task_lists() {
processed_task_mutex.unlock();
cout << "sorting finished of "<< local_processed_tasks.size() << endl;
size_t total_funcs = 0;
for (auto&& task: local_processed_tasks)
total_funcs += task.current.size();
cout << "estimated size: "
<< sizeof(FunctionTask) * total_funcs / 1024 / 1024 << " MB" << endl;
// Обеспечим увеличение размеров, чтобы не было проблем со включением одного
// в другое
sort(
@@ -440,6 +449,7 @@ void process_task_lists() {
//cout << "task finished, appending" << endl;
++completed_tasks;
print_progress(completed_tasks, total_possible_functions);
sort(task.current.begin(), task.current.end());
auto func_class = task.current;
bool is_need_append = true;
vector<decltype(shared_function_classes)::iterator> functions_to_remove;
@@ -471,7 +481,10 @@ void process_task_lists() {
}
}
if ( is_need_append ) {
shared_function_classes.push_back(func_class);
shared_function_classes.push_back(set<FiniteFunction<CUR_BASE>>(
func_class.begin(),
func_class.end()
));
for (auto&& func: func_class)
bad_functions.insert(func);
}
@@ -490,6 +503,7 @@ void process_task_lists() {
int main() {
cout << sizeof(FiniteFunction<CUR_BASE>) << " " << sizeof(FunctionTask) << endl;
auto FiniteFunctionHasher = [](const FiniteFunction<CUR_BASE> &f) -> uint32_t {
return f.get_hash();
};
@@ -525,7 +539,7 @@ int main() {
completed_tasks = 0;
for (auto&& func: allowed_functions) {
FunctionTask task;
task.current.insert(func);
task.current = {func};
task.is_finished = false;
task.current_max_coeff = 1;
task_list.push_back(task);