GFD validation #154
GFD validation #154
Conversation
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
|
|
||
| std::vector<Eigen::VectorXi> current = {}; | ||
| for (int j = 0; j < available_vertices.at(0).size(); ++j) { | ||
| Eigen::VectorXi temp = Eigen::VectorXi::Zero(Q.rows()); |
There was a problem hiding this comment.
warning: comparison of integers of different signs: 'int' and 'std::vector::size_type' (aka 'unsigned long') [clang-diagnostic-sign-compare]
rrent = {};
^| current.push_back(temp); | ||
| } | ||
| for (int i = 1; i < available_vertices.size(); ++i) { | ||
| std::vector<Eigen::VectorXi> new_vecs = {}; |
There was a problem hiding this comment.
warning: comparison of integers of different signs: 'int' and 'std::vector::size_type' (aka 'unsigned long') [clang-diagnostic-sign-compare]
ush_back(temp);
^| for (const Eigen::VectorXi& vec : current) { | ||
| for (int j = 0; j < available_vertices.at(i).size(); ++j) { | ||
| bool contains = false; | ||
| int index = available_vertices.at(i).at(j); |
There was a problem hiding this comment.
warning: comparison of integers of different signs: 'int' and 'std::vector::size_type' (aka 'unsigned long') [clang-diagnostic-sign-compare]
; j < available_vertices.at(i).size(); ++j) {
^| (result.begin() + i)->push_back(weight); | ||
| } else { | ||
| sort(result.begin(), result.end(), [](std::vector<int> a, std::vector<int> b) { | ||
| return std::accumulate(a.begin(), a.end(), 0, std::plus<int>()) < |
There was a problem hiding this comment.
warning: Value stored to 'cur' during its initialization is never read [clang-analyzer-deadcode.DeadStores]
step
^src/algorithms/gfd/gfd_validation.cpp:310: Value stored to 'cur' during its initialization is never read
step
^| (result.begin() + i)->push_back(weight); | ||
| } else { | ||
| sort(result.begin(), result.end(), [](std::vector<int> a, std::vector<int> b) { | ||
| return std::accumulate(a.begin(), a.end(), 0, std::plus<int>()) < |
There was a problem hiding this comment.
warning: unused variable 'cur' [clang-diagnostic-unused-variable]
step
^| } else { | ||
| sort(result.begin(), result.end(), [](std::vector<int> a, std::vector<int> b) { | ||
| return std::accumulate(a.begin(), a.end(), 0, std::plus<int>()) < | ||
| std::accumulate(b.begin(), b.end(), 0, std::plus<int>()); |
There was a problem hiding this comment.
warning: comparison of integers of different signs: 'int' and 'unsigned long' [clang-diagnostic-sign-compare]
eted_large) {
^| this->result = this->getSatisfiedGFDs(this->graph, this->gfds, std::thread::hardware_concurrency()); | ||
|
|
||
| auto elapsed_milliseconds = std::chrono::duration_cast<std::chrono::milliseconds>( | ||
| std::chrono::system_clock::now() - start_time); |
There was a problem hiding this comment.
warning: comparison of integers of different signs: 'int' and 'std::vector::size_type' (aka 'unsigned long') [clang-diagnostic-sign-compare]
t(gfd_index);
^
src/algorithms/gfd/gfd_validation.h
Outdated
| std::vector<GFD> getSatisfiedGFDs(const Graph&, const std::vector<GFD>&, const int&); | ||
| public: | ||
| GFDValidation() = default; | ||
| GFDValidation(Graph graph_, std::vector<GFD> gfds_) : graph(graph_), gfds(gfds_) {} |
There was a problem hiding this comment.
warning: explicitly defaulted default constructor is implicitly deleted [clang-diagnostic-defaulted-function-deleted]
GFDValidation() = default;
^src/algorithms/gfd/gfd_validation.h:11: default constructor of 'GFDValidation' is implicitly deleted because field 'graph' has no default constructor
ph graph;
^
src/algorithms/gfd/pattern.cpp
Outdated
| this->indices.insert(index); | ||
| max = max < index ? index : max; | ||
| } | ||
| if (max != this->indices.size() - 1) { |
There was a problem hiding this comment.
warning: comparison of integers of different signs: 'int' and 'unsigned long' [clang-diagnostic-sign-compare]
x;
^
AntonChern
force-pushed
the
gfd
branch
2 times, most recently
from
b194a89 to
45ec1c9
Compare
|
|
||
| std::vector<Eigen::VectorXi> current = {}; | ||
| for (int j = 0; j < available_vertices.at(0).size(); ++j) { | ||
| Eigen::VectorXi temp = Eigen::VectorXi::Zero(Q.rows()); |
There was a problem hiding this comment.
warning: comparison of integers of different signs: 'int' and 'std::vector::size_type' (aka 'unsigned long') [clang-diagnostic-sign-compare]
> current = {};
^| } | ||
| for (int i = 1; i < available_vertices.size(); ++i) { | ||
| std::vector<Eigen::VectorXi> new_vecs = {}; | ||
| for (const Eigen::VectorXi &vec : current) { |
There was a problem hiding this comment.
warning: comparison of integers of different signs: 'int' and 'std::vector::size_type' (aka 'unsigned long') [clang-diagnostic-sign-compare]
< available_vertices.size(); ++i) {
^| for (const Eigen::VectorXi &vec : current) { | ||
| for (int j = 0; j < available_vertices.at(i).size(); ++j) { | ||
| bool contains = false; | ||
| int index = available_vertices.at(i).at(j); |
There was a problem hiding this comment.
warning: comparison of integers of different signs: 'int' and 'std::vector::size_type' (aka 'unsigned long') [clang-diagnostic-sign-compare]
(int j = 0; j < available_vertices.at(i).size(); ++j) {
^| sort(result.begin(), result.end(), | ||
| [](std::vector<int> a, std::vector<int> b) { | ||
| return std::accumulate(a.begin(), a.end(), 0, std::plus<int>()) < | ||
| std::accumulate(b.begin(), b.end(), 0, std::plus<int>()); |
There was a problem hiding this comment.
warning: comparison of integers of different signs: 'int' and 'unsigned long' [clang-diagnostic-sign-compare]
r (const int &weight : deleted_large) {
^| auto elapsed_milliseconds = | ||
| std::chrono::duration_cast<std::chrono::milliseconds>( | ||
| std::chrono::system_clock::now() - start_time); | ||
| return elapsed_milliseconds.count(); |
There was a problem hiding this comment.
warning: comparison of integers of different signs: 'int' and 'std::vector::size_type' (aka 'unsigned long') [clang-diagnostic-sign-compare]
i < gfds.size(); ++i) {
^
src/algorithms/gfd/gfd_validation.h
Outdated
|
|
||
| public: | ||
| GFDValidation() = default; | ||
| GFDValidation(Graph graph_, std::vector<GFD> gfds_) |
There was a problem hiding this comment.
warning: explicitly defaulted default constructor is implicitly deleted [clang-diagnostic-defaulted-function-deleted]
ublic:
^src/algorithms/gfd/gfd_validation.h:11: default constructor of 'GFDValidation' is implicitly deleted because field 'graph' has no default constructor
ph graph;
^
src/algorithms/gfd/pattern.cpp
Outdated
| this->indices.insert(index); | ||
| max = max < index ? index : max; | ||
| } | ||
| if (max != this->indices.size() - 1) { |
There was a problem hiding this comment.
warning: comparison of integers of different signs: 'int' and 'unsigned long' [clang-diagnostic-sign-compare]
: max;
^
AntonChern
force-pushed
the
gfd
branch
2 times, most recently
from
933c048 to
8e46320
Compare
|
|
||
| namespace algos { | ||
|
|
||
| void GFDValidation::FitInternal(model::IDatasetStream& data_stream) {} |
There was a problem hiding this comment.
warning: unused parameter 'data_stream' [clang-diagnostic-unused-parameter]
lgos {
^|
|
||
| std::vector<Eigen::VectorXi> current = {}; | ||
| for (int j = 0; j < available_vertices.at(0).size(); ++j) { | ||
| Eigen::VectorXi temp = Eigen::VectorXi::Zero(Q.rows()); |
There was a problem hiding this comment.
warning: comparison of integers of different signs: 'int' and 'std::vector::size_type' (aka 'unsigned long') [clang-diagnostic-sign-compare]
Xi> current = {};
^| } | ||
| for (int i = 1; i < available_vertices.size(); ++i) { | ||
| std::vector<Eigen::VectorXi> new_vecs = {}; | ||
| for (const Eigen::VectorXi &vec : current) { |
There was a problem hiding this comment.
warning: comparison of integers of different signs: 'int' and 'std::vector::size_type' (aka 'unsigned long') [clang-diagnostic-sign-compare]
i < available_vertices.size(); ++i) {
^| for (const Eigen::VectorXi &vec : current) { | ||
| for (int j = 0; j < available_vertices.at(i).size(); ++j) { | ||
| bool contains = false; | ||
| int index = available_vertices.at(i).at(j); |
There was a problem hiding this comment.
warning: comparison of integers of different signs: 'int' and 'std::vector::size_type' (aka 'unsigned long') [clang-diagnostic-sign-compare]
r (int j = 0; j < available_vertices.at(i).size(); ++j) {
^| return std::accumulate(a.begin(), a.end(), 0, std::plus<int>()) < | ||
| std::accumulate(b.begin(), b.end(), 0, std::plus<int>()); | ||
| }); | ||
| result.begin()->push_back(weight); |
There was a problem hiding this comment.
warning: comparison of integers of different signs: 'int' and 'unsigned long' [clang-diagnostic-sign-compare]
f (i < m - large_processors.size()) {
^| auto elapsed_milliseconds = | ||
| std::chrono::duration_cast<std::chrono::milliseconds>( | ||
| std::chrono::system_clock::now() - start_time); | ||
| std::cout << "Satisfied GFDs: " << result.size() |
There was a problem hiding this comment.
warning: comparison of integers of different signs: 'int' and 'std::vector::size_type' (aka 'unsigned long') [clang-diagnostic-sign-compare]
gfd_index);
^
src/algorithms/gfd/parser.cpp
Outdated
| size_t vertices_num = stoi(sizes.at(0)); | ||
| size_t edges_num = stoi(sizes.at(1)); | ||
| for (int i = 0; i < vertices_num; ++i) { | ||
| std::getline(stream, line); |
There was a problem hiding this comment.
warning: comparison of integers of different signs: 'int' and 'size_t' (aka 'unsigned long') [clang-diagnostic-sign-compare]
at(1));
^
src/algorithms/gfd/parser.cpp
Outdated
| } | ||
| for (int i = 0; i < edges_num; ++i) { | ||
| std::getline(stream, line); | ||
| auto indices = Parser::split(line.substr(0, line.find("[")), "->"); |
There was a problem hiding this comment.
warning: comparison of integers of different signs: 'int' and 'size_t' (aka 'unsigned long') [clang-diagnostic-sign-compare]
= 0; i < edges_num; ++i) {
^
src/algorithms/gfd/parser.cpp
Outdated
| size_t edges_num = stoi(sizes.at(1)); | ||
| for (int i = 0; i < vertices_num; ++i) { | ||
| std::map<std::string, std::string> attrs; | ||
| std::getline(stream, line); |
There was a problem hiding this comment.
warning: comparison of integers of different signs: 'int' and 'size_t' (aka 'unsigned long') [clang-diagnostic-sign-compare]
or (int i = 0; i < vertices_num; ++i) {
^
src/algorithms/gfd/parser.cpp
Outdated
| } | ||
| for (int i = 0; i < edges_num; ++i) { | ||
| std::getline(stream, line); | ||
| auto indices = Parser::split(line.substr(0, line.find("[")), "->"); |
There was a problem hiding this comment.
warning: comparison of integers of different signs: 'int' and 'size_t' (aka 'unsigned long') [clang-diagnostic-sign-compare]
es.emplace(index, attrs);
^
src/algorithms/gfd/balancer.cpp
Outdated
| (result.begin() + i)->push_back(weight); | ||
| } | ||
| else { | ||
| sort(result.begin(), result.end(), |
There was a problem hiding this comment.
warning: comparison of integers of different signs: 'int' and 'unsigned long' [clang-diagnostic-sign-compare]
ge) {
^|
|
||
| namespace algos { | ||
|
|
||
| void GFDValidation::FitInternal(model::IDatasetStream& data_stream) {} |
There was a problem hiding this comment.
warning: unused parameter 'data_stream' [clang-diagnostic-unused-parameter]
e algos {
^| } | ||
|
|
||
| template <typename graph_type> | ||
| graph_type GFDValidation::getSubgraph(const graph_type& graph, |
There was a problem hiding this comment.
warning: non-void function does not return a value in all control paths [clang-diagnostic-return-type]
ttern[*i].node_id;
^src/algorithms/gfd/gfd_validation.cpp:280: in instantiation of function template specialization 'algos::GFDValidation::getCenter<boost::adjacency_list<boost::vecS, boost::vecS, boost::bidirectionalS, vertex, edge>>' requested here
s = 0;
^| auto in = boost::in_degree(*i, graph); | ||
| if (out >= degrees.first && in >= degrees.second && | ||
| graph[*i].attributes.at("label") == label) { | ||
| result.push_back(graph[*i].node_id); |
There was a problem hiding this comment.
warning: comparison of integers of different signs: 'typename config::degree_size_type' (aka 'unsigned long') and 'const int' [clang-diagnostic-sign-compare]
raph);
^| auto in = boost::in_degree(*i, graph); | ||
| if (out >= degrees.first && in >= degrees.second && | ||
| graph[*i].attributes.at("label") == label) { | ||
| result.push_back(graph[*i].node_id); |
There was a problem hiding this comment.
warning: comparison of integers of different signs: 'typename config::degree_size_type' (aka 'unsigned long') and 'const int' [clang-diagnostic-sign-compare]
raph);
^src/algorithms/gfd/gfd_validation.cpp:285: in instantiation of function template specialization 'algos::GFDValidation::getCandidateVertices<boost::adjacency_list<boost::vecS, boost::vecS, boost::bidirectionalS, vertex, edge>>' requested here
or<int> candidate_vertices = getCandidateVertices(
^| unsigned long long GFDValidation::ExecuteInternal() { | ||
| auto start_time = std::chrono::system_clock::now(); | ||
|
|
||
| this->result = this->generateSatisfiedGFDs(this->graph, this->gfds, |
There was a problem hiding this comment.
warning: comparison of integers of different signs: 'int' and 'std::vector::size_type' (aka 'unsigned long') [clang-diagnostic-sign-compare]
fied.insert(gfd_index);
^
|
весь ПР ещё не смотрел + возможно это WIP, но большие датасеты (>100k строк) надо убирать из |
И видимо класть их |
src/core/algorithms/gfd/balancer.cpp
Outdated
| (result.begin() + i)->push_back(weight); | ||
| } | ||
| else { | ||
| sort(result.begin(), result.end(), |
There was a problem hiding this comment.
warning: comparison of integers of different signs: 'int' and 'unsigned long' [clang-diagnostic-sign-compare]
ge) {
^| } | ||
| } | ||
| return result; | ||
| } |
There was a problem hiding this comment.
warning: comparison of integers of different signs: 'int' and 'typename config::degree_size_type' (aka 'unsigned long') [clang-diagnostic-sign-compare]
< boost::degree(*adjacency_it, graph)) {
^| return true; | ||
| } | ||
|
|
||
| int EGFDValidation::getRoot(const graph_t& graph, const graph_t& query, const std::set<vertex_t>& core) { |
There was a problem hiding this comment.
warning: comparison of integers of different signs: 'std::map<std::basic_string, unsigned long>::mapped_type' (aka 'unsigned long') and 'const int' [clang-diagnostic-sign-compare]
grees.find(label) == graph_label_degrees.end() ||
^|
|
||
| int b_degree = boost::degree(b, query); | ||
| int bn = 0; | ||
| for (const vertex_t& e : label_classes.at(query[b].attributes.at("label"))) { |
There was a problem hiding this comment.
warning: comparison of integers of different signs: 'typename config::degree_size_type' (aka 'unsigned long') and 'int' [clang-diagnostic-sign-compare]
utes.at("label"))) {
^| return an / a_degree < bn / b_degree; | ||
| }; | ||
| std::sort(order.begin(), order.end(), cmp1); | ||
| int top = std::min(int(order.size()), 3); |
There was a problem hiding this comment.
warning: comparison of integers of different signs: 'typename config::degree_size_type' (aka 'unsigned long') and 'int' [clang-diagnostic-sign-compare]
if (boost::degree(e, graph) >= b_degree) {
^| std::set<vertex_t> to_delete = {}; | ||
| for (auto& link : parent) { | ||
| if (indices.find(link.first) == indices.end()) { | ||
| to_delete.insert(link.first); |
There was a problem hiding this comment.
warning: comparison of integers of different signs: 'int' and 'unsigned long' [clang-diagnostic-sign-compare]
(j == core.size() - 1) {
^| for (boost::tie(i, end) = vertices(pattern); i != end; ++i) { | ||
| bool is_center = true; | ||
| typename boost::graph_traits<graph_t>::vertex_iterator j; | ||
| for (j = vertices(pattern).first; j != end; ++j) { |
There was a problem hiding this comment.
warning: variable 'result' is used uninitialized whenever 'for' loop exits because its condition is false [clang-diagnostic-sometimes-uninitialized]
rn); i != end; ++i) {
^Additional context
src/core/algorithms/gfd/gfd_validation.cpp:128: uninitialized use occurs here
k;
^src/core/algorithms/gfd/gfd_validation.cpp:114: remove the condition if it is always true
rn); i != end; ++i) {
^src/core/algorithms/gfd/gfd_validation.cpp:111: initialize the variable 'result' to silence this warning
, em);
^|
|
||
| //for (int i = 0; i < processors_num; ++i) { | ||
| // for (auto& e :requests.at(i)) { |
There was a problem hiding this comment.
warning: comparison of integers of different signs: 'int' and 'std::vector::size_type' (aka 'unsigned long') [clang-diagnostic-sign-compare]
for (int i = 0; i < partition.size(); ++i) {
^| balanced_messages.push_back(messages); | ||
| } | ||
|
|
||
| std::vector<GFD> result = {}; |
There was a problem hiding this comment.
warning: comparison of integers of different signs: 'int' and 'std::vector::size_type' (aka 'unsigned long') [clang-diagnostic-sign-compare]
for (int i = 0; i < balanced_weights.size(); ++i) {
^| this->result = this->generateSatisfiedGFDs(this->graph, this->gfds); | ||
|
|
||
| auto elapsed_milliseconds = | ||
| std::chrono::duration_cast<std::chrono::milliseconds>( |
There was a problem hiding this comment.
warning: comparison of integers of different signs: 'int' and 'std::map<int, GFD>::size_type' (aka 'unsigned long') [clang-diagnostic-sign-compare]
satisfied.insert(ind);
^
src/core/algorithms/gfd/balancer.cpp
Outdated
| for (std::size_t i = 0; i < m; ++i) { | ||
| // the first value is index | ||
| std::vector<int> temp = { i }; | ||
| result.push_back(temp); |
There was a problem hiding this comment.
warning: non-constant-expression cannot be narrowed from type 'std::size_t' (aka 'unsigned long') to 'int' in initializer list [clang-diagnostic-c++11-narrowing]
<int> temp = { i };
^Additional context
src/core/algorithms/gfd/balancer.cpp:21: insert an explicit cast to silence this issue
<int> temp = { i };
^| return seq; | ||
| } | ||
|
|
||
| bool EGFDValidation::ValidateNT(const graph_t& graph, const vertex_t& v, const graph_t& query, const vertex_t& u, |
There was a problem hiding this comment.
warning: Division by zero [clang-analyzer-core.DivideZero]
pi, a, a_origin) / candidates_cardinality(cpi, a_origin) <
^Additional context
src/core/algorithms/gfd/egfd_validation.cpp:640: Calling 'EGFDValidation::matching_order'
s.push_back(nt);
^src/core/algorithms/gfd/egfd_validation.cpp:582: Assuming the condition is true
d(), std::back_inserter(seq));
^src/core/algorithms/gfd/egfd_validation.cpp:582: Loop condition is true. Entering loop body
d(), std::back_inserter(seq));
^src/core/algorithms/gfd/egfd_validation.cpp:594: Calling 'min_element<__gnu_cxx::__normal_iterator<std::vector *, std::vector<std::vector>>, (lambda at /github/workspace/src/core/algorithms/gfd/egfd_validation.cpp:577:20)>'
_ = *std::min_element(paths.begin(), paths.end(), cmp);
^/usr/include/c++/11/bits/stl_algo.h:5674: Calling '__min_element<__gnu_cxx::__normal_iterator<std::vector *, std::vector<std::vector>>, __gnu_cxx::__ops::_Iter_comp_iter<(lambda at /github/workspace/src/core/algorithms/gfd/egfd_validation.cpp:577:20)>>'
return _GLIBCXX_STD_A::__min_element(__first, __last,
^/usr/include/x86_64-linux-gnu/c++/11/bits/c++config.h:419: expanded from macro '_GLIBCXX_STD_A'
# define _GLIBCXX_STD_A std
^/usr/include/c++/11/bits/stl_algo.h:5619: Taking false branch
if (__first == __last)
^/usr/include/c++/11/bits/stl_algo.h:5622: Loop condition is true. Entering loop body
while (++__first != __last)
^/usr/include/c++/11/bits/stl_algo.h:5623: Calling '_Iter_comp_iter::operator()'
if (__comp(__first, __result))
^/usr/include/c++/11/bits/predefined_ops.h:157: Calling 'operator()'
{ return bool(_M_comp(*__it1, *__it2)); }
^src/core/algorithms/gfd/egfd_validation.cpp:592: Calling 'EGFDValidation::candidates_cardinality'
pi, a, a_origin) / candidates_cardinality(cpi, a_origin) <
^src/core/algorithms/gfd/egfd_validation.cpp:549: Returning zero
return edge_cans.second.size();
^src/core/algorithms/gfd/egfd_validation.cpp:592: Returning from 'EGFDValidation::candidates_cardinality'
pi, a, a_origin) / candidates_cardinality(cpi, a_origin) <
^src/core/algorithms/gfd/egfd_validation.cpp:592: Division by zero
pi, a, a_origin) / candidates_cardinality(cpi, a_origin) <
^| return seq; | ||
| } | ||
|
|
||
| bool EGFDValidation::ValidateNT(const graph_t& graph, const vertex_t& v, const graph_t& query, const vertex_t& u, |
There was a problem hiding this comment.
warning: Division by zero [clang-analyzer-core.DivideZero]
pi, a, a_origin) / candidates_cardinality(cpi, a_origin) <
^Additional context
src/core/algorithms/gfd/egfd_validation.cpp:640: Calling 'EGFDValidation::matching_order'
s.push_back(nt);
^src/core/algorithms/gfd/egfd_validation.cpp:582: Assuming the condition is true
d(), std::back_inserter(seq));
^src/core/algorithms/gfd/egfd_validation.cpp:582: Loop condition is true. Entering loop body
d(), std::back_inserter(seq));
^src/core/algorithms/gfd/egfd_validation.cpp:594: Calling 'min_element<__gnu_cxx::__normal_iterator<std::vector *, std::vector<std::vector>>, (lambda at /github/workspace/src/core/algorithms/gfd/egfd_validation.cpp:577:20)>'
_ = *std::min_element(paths.begin(), paths.end(), cmp);
^/usr/include/c++/11/bits/stl_algo.h:5674: Calling '__min_element<__gnu_cxx::__normal_iterator<std::vector *, std::vector<std::vector>>, __gnu_cxx::__ops::_Iter_comp_iter<(lambda at /github/workspace/src/core/algorithms/gfd/egfd_validation.cpp:577:20)>>'
return _GLIBCXX_STD_A::__min_element(__first, __last,
^/usr/include/x86_64-linux-gnu/c++/11/bits/c++config.h:419: expanded from macro '_GLIBCXX_STD_A'
# define _GLIBCXX_STD_A std
^/usr/include/c++/11/bits/stl_algo.h:5619: Taking false branch
if (__first == __last)
^/usr/include/c++/11/bits/stl_algo.h:5622: Loop condition is true. Entering loop body
while (++__first != __last)
^/usr/include/c++/11/bits/stl_algo.h:5623: Calling '_Iter_comp_iter::operator()'
if (__comp(__first, __result))
^/usr/include/c++/11/bits/predefined_ops.h:157: Calling 'operator()'
{ return bool(_M_comp(*__it1, *__it2)); }
^src/core/algorithms/gfd/egfd_validation.cpp:592: Calling 'EGFDValidation::candidates_cardinality'
pi, a, a_origin) / candidates_cardinality(cpi, a_origin) <
^src/core/algorithms/gfd/egfd_validation.cpp:549: Returning zero
return edge_cans.second.size();
^src/core/algorithms/gfd/egfd_validation.cpp:592: Returning from 'EGFDValidation::candidates_cardinality'
pi, a, a_origin) / candidates_cardinality(cpi, a_origin) <
^src/core/algorithms/gfd/egfd_validation.cpp:592: Division by zero
pi, a, a_origin) / candidates_cardinality(cpi, a_origin) <
^| } | ||
|
|
||
| while ((match.at(i).first != match.at(i).second) && (visited(*match.at(i).first, i) || | ||
| !ValidateNT(graph, *match.at(i).first, query, seq.at(i), seq, parent, match))) { |
There was a problem hiding this comment.
warning: comparison of integers of different signs: 'std::size_t' (aka 'unsigned long') and 'int' [clang-diagnostic-sign-compare]
std::size_t i = core.size() - 1;
^| std::pair<vertex_t, vertex_t> edge(parent.at(seq.at(k)), seq.at(k)); | ||
| std::size_t index = std::find(seq.begin(), seq.end(), parent.at(seq.at(k))) - seq.begin(); | ||
| std::pair<std::set<vertex_t>::iterator, std::set<vertex_t>::iterator> | ||
| its(cpi.at(edge).at(*match.at(index).first).begin(), cpi.at(edge).at(*match.at(index).first).end()); |
There was a problem hiding this comment.
warning: comparison of integers of different signs: 'std::size_t' (aka 'unsigned long') and 'int' [clang-diagnostic-sign-compare]
i++;
^|
|
||
| namespace algos { | ||
|
|
||
| void NaiveGFDValidation::FitInternal(model::IDatasetStream& data_stream) {} |
There was a problem hiding this comment.
warning: unused parameter 'data_stream' [clang-diagnostic-unused-parameter]
os {
^
| } | ||
|
|
||
| while ((match.at(i).first != match.at(i).second) && (visited(*match.at(i).first, i) || | ||
| !ValidateNT(graph, *match.at(i).first, query, seq.at(i), seq, parent, match))) { |
There was a problem hiding this comment.
warning: comparison of integers of different signs: 'int' and 'std::set::size_type' (aka 'unsigned long') [clang-diagnostic-sign-compare]
t i = static_cast<int>(core.size()) - 1;
^
|
Also, you will have to rework the commits themselves. E.g., group "refactor" commits, remove commits on eigenvalues, squash development steps, etc. Finally, write descriptive commit messages. You can do this before the review-based refactor or after --- which would be more convenient for you. This is necessary to keep the commit history readable and informative. On the contrary, it is a bad practice to just squash everything into a single 2k-lines-of-code commit, as it would be hard to review and make sense of the reasons which lead to a particular change. Personally, I have the following criteria for the perfect commit list:
This is a pretty subjective topic, but I hope my comment will point you in a right direction. |
AntonChern
force-pushed
the
gfd
branch
2 times, most recently
from
5c0f5b8 to
4a99392
Compare
AntonChern
force-pushed
the
gfd
branch
4 times, most recently
from
dfc4049 to
653a298
Compare
src/core/algorithms/gfd/balancer.cpp
Outdated
| if (i < m - numOfLargeProcs) { | ||
| (result.begin() + i)->push_back(weight); | ||
| } else { | ||
| sort(result.begin(), result.end(), [](std::vector<int> a, std::vector<int> b) { |
There was a problem hiding this comment.
use std::vector<int> const & to avoid making unnecessary copies
There was a problem hiding this comment.
auto cGreater at 114 still has this problem
There was a problem hiding this comment.
Good job!
There is one pending comment from my previous review, @vs9h comments, and there is some readability refactoring in egfd_validation to be done (for inspiration, see HyFD and HyUCC along with their common components in hycommon). Other than that, it seems, I have nothing to add.
AntonChern
force-pushed
the
gfd
branch
3 times, most recently
from
63b3453 to
c1d4ed1
Compare
| std::vector<std::string> Split(std::string str, std::string sep); | ||
| std::vector<Literal> ParseLiterals(std::istream& stream); | ||
| void WriteLiterals(std::ostream& stream, std::vector<Literal> const& literals); |
There was a problem hiding this comment.
These functions are needed only for implementation, so it is better not to declare them in the header.
Don't forget to wrap these function to anonymous namespace in the source file.
src/core/algorithms/gfd/balancer.h
Outdated
| Balancer() = default; | ||
| ~Balancer() = default; |
| Balancer* balancer = new Balancer(); | ||
| std::vector<std::vector<int>> balanced_weights = balancer->Balance(weights, threads_num_); | ||
| delete balancer; |
There was a problem hiding this comment.
| Balancer* balancer = new Balancer(); | |
| std::vector<std::vector<int>> balanced_weights = balancer->Balance(weights, threads_num_); | |
| delete balancer; | |
| Balancer balancer; | |
| std::vector<std::vector<int>> balanced_weights = balancer.Balance(weights, threads_num_); | |
Added classes for working with graphs and GFDs. Graphs are presented as boost graphs.
The parser provides methods for writing and reading graphs and GFDs from a file. The graph is represented in text format in the DOT language. To represent GFD, lists of literals are indicated before the graph-pattern (premises are the first line, conclusion is the second) in the format index.feature=name (index1.feature1=index2.feature2) separated by a space.
| @@ -55,9 +56,25 @@ BETTER_ENUM(AlgorithmType, char, | |||
|
|
|||
| /* UCC verifier algorithm */ | |||
| ucc_verifier, | |||
| <<<<<<< HEAD | |||
There was a problem hiding this comment.
warning: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^| <<<<<<< HEAD | ||
| gfdvalid | ||
| >>>>>>> Implement baseline GFD validation algorithm | ||
| ======= |
There was a problem hiding this comment.
warning: expected '= constant-expression' or end of enumerator definition [clang-diagnostic-error]
=======
^| <<<<<<< HEAD | ||
| gfdvalid | ||
| >>>>>>> Implement baseline GFD validation algorithm | ||
| ======= |
There was a problem hiding this comment.
warning: expected expression [clang-diagnostic-error]
=======
^| <<<<<<< HEAD | ||
| gfdvalid | ||
| >>>>>>> Implement baseline GFD validation algorithm | ||
| ======= |
There was a problem hiding this comment.
warning: expected expression [clang-diagnostic-error]
=======
^| <<<<<<< HEAD | ||
| gfdvalid | ||
| >>>>>>> Implement baseline GFD validation algorithm | ||
| ======= |
There was a problem hiding this comment.
warning: expected expression [clang-diagnostic-error]
=======
^| gfdvalid | ||
| >>>>>>> Implement baseline GFD validation algorithm | ||
| ======= | ||
| gfdvalid, |
There was a problem hiding this comment.
warning: use of undeclared identifier 'gfdvalid'; did you mean 'egfdvalid'? [clang-diagnostic-error]
| gfdvalid, | |
| egfdvalid, |
(skipping 42 expansions in backtrace; use -fmacro-backtrace-limit=0 to see all)
| >>>>>>> Implement baseline GFD validation algorithm | ||
| ======= | ||
| gfdvalid, | ||
| <<<<<<< HEAD |
There was a problem hiding this comment.
warning: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^
| @@ -6,10 +6,25 @@ | |||
|
|
|||
| namespace algos { | |||
|
|
|||
| <<<<<<< HEAD | |||
There was a problem hiding this comment.
warning: version control conflict marker in file [clang-diagnostic-error]
<<<<<<< HEAD
^| fd_verifier::FDVerifier, HyUCC, PyroUCC, cfd::FDFirstAlgorithm, | ||
| ACAlgorithm, UCCVerifier, Faida, GfdValidation, EGfdValidation>; | ||
| >>>>>>> 8880e8c... Implement efficient GFD validation algorithm | ||
| ======= |
There was a problem hiding this comment.
warning: expected unqualified-id [clang-diagnostic-error]
=======
^| metric::MetricVerifier, DataStats, fd_verifier::FDVerifier, HyUCC, PyroUCC, | ||
| cfd::FDFirstAlgorithm, ACAlgorithm, UCCVerifier, Faida, GfdValidation, | ||
| EGfdValidation, NaiveGfdValidation>; | ||
| >>>>>>> 6a7de71... Implement naive GFD validation algorithm |
There was a problem hiding this comment.
warning: expected unqualified-id [clang-diagnostic-error]
>>>>>>> 6a7de71... Implement naive GFD validation algorithm
^Algorithm for checking if a graph functional dependency satisfies a given graph. Algorithm can be run from the console.
The algorithm checking the satisfiability of GFD. Uses CPI algorithm as a subgraph search.
GFD validation algorithm that uses VF2 algorithm to find a subgraph.
| @@ -57,7 +58,12 @@ BETTER_ENUM(AlgorithmType, char, | |||
| ucc_verifier, | |||
|
|
|||
There was a problem hiding this comment.
warning: expected identifier [clang-diagnostic-error]
<<<<<<< HEAD
^| @@ -57,7 +58,12 @@ BETTER_ENUM(AlgorithmType, char, | |||
| ucc_verifier, | |||
|
|
|||
There was a problem hiding this comment.
warning: expected unqualified-id [clang-diagnostic-error]
<<<<<<< HEAD
^| @@ -57,7 +58,12 @@ BETTER_ENUM(AlgorithmType, char, | |||
| ucc_verifier, | |||
|
|
|||
There was a problem hiding this comment.
warning: expected expression [clang-diagnostic-error]
<<<<<<< HEAD
^| @@ -57,7 +58,12 @@ BETTER_ENUM(AlgorithmType, char, | |||
| ucc_verifier, | |||
|
|
|||
There was a problem hiding this comment.
warning: expected expression [clang-diagnostic-error]
<<<<<<< HEAD
^| @@ -57,7 +58,12 @@ BETTER_ENUM(AlgorithmType, char, | |||
| ucc_verifier, | |||
|
|
|||
There was a problem hiding this comment.
warning: expected expression [clang-diagnostic-error]
<<<<<<< HEAD
^| @@ -57,7 +58,12 @@ BETTER_ENUM(AlgorithmType, char, | |||
| ucc_verifier, | |||
|
|
|||
There was a problem hiding this comment.
warning: use of undeclared identifier 'HEAD' [clang-diagnostic-error]
<<<<<<< HEAD
^
Algorithm for checking if a graph functional dependency satisfies a given graph.