This commit is contained in:
codeboss 2024-10-13 18:51:39 +08:00
parent 0819987eb1
commit c42c399e78
2 changed files with 1 additions and 68 deletions

View File

@ -464,66 +464,8 @@ void dags::DAGGraph::nodes_sort_with_belows(int curr_layer, const QList<std::sha
}
}
//void dags::DAGGraph::graph_springs_layout_forward(const QList<std::shared_ptr<DAGOrderHelper>>& total_nodes) {
// int layer_index = 0;
// QList<std::shared_ptr<DAGOrderHelper>> nodes;
// while ((nodes = this->nodes_revise_forward_within_layer(layer_index, total_nodes)).size()) {
// current_nodelist_filling_springs(nodes);
// nodes_sort_with_above(layer_index, total_nodes);
// layer_index++;
// }
//}
//QList<std::shared_ptr<DAGOrderHelper>> dags::DAGGraph::nodes_revise_forward_within_layer(int layer_index, const QList<std::shared_ptr<DAGOrderHelper>>& nodes) {
//
//
//
// QList<std::shared_ptr<DAGOrderHelper>> nodes_within_previous_layer;
// if (layer_index) {
// std::copy_if(nodes.begin(), nodes.end(), std::back_inserter(nodes_within_previous_layer),
// [=](std::shared_ptr<DAGOrderHelper> n) { return n->layerNumber() == layer_index - 1; });
// }
// QList<std::shared_ptr<DAGOrderHelper>> nodes_within_current_layer;
// std::copy_if(nodes.begin(), nodes.end(), std::back_inserter(nodes_within_current_layer),
// [=](std::shared_ptr<DAGOrderHelper> n) { return n->layerNumber() == layer_index; });
//
// if (nodes_within_current_layer.size()) {
// QList<std::tuple<std::shared_ptr<DAGOrderHelper>, int>> items_forwards;
// for (auto node : nodes_within_current_layer) {
// auto forwards = node_revise_via_upstream(nodes_within_previous_layer, node);
// items_forwards.append(std::make_tuple(node, forwards));
// }
//
// for (auto idx = 0; idx < items_forwards.size(); ++idx) {
// auto curr_item = items_forwards[idx];
// if (std::get<1>(curr_item) > 2) {
// auto node = std::get<0>(curr_item);
// node->setSortNumber(node->sortNumber().toInt() + std::get<1>(curr_item));
// }
// }
// }
//
// return nodes_within_current_layer;
//}
//double dags::DAGGraph::node_revise_via_upstream(const QList<std::tuple<std::shared_ptr<DAGOrderHelper>, double>>& prev_nodes, std::shared_ptr<DAGOrderHelper> node) {
// auto upstream_nodes = node->getUpstreamNodes();
// QList<double> lev_rst;
// std::transform(upstream_nodes.begin(), upstream_nodes.end(),
// std::back_inserter(lev_rst), [&](std::shared_ptr<DAGOrderHelper> upn)->double {
// auto trans_it = std::find_if(prev_nodes.begin(), prev_nodes.end(),
// [&](std::tuple<std::shared_ptr<DAGOrderHelper>, double> ins) {
// return upn == std::get<0>(ins);
// });
// if (trans_it != prev_nodes.end()) {
// auto trans_val = (std::get<1>(*trans_it) / std::get<0>(*trans_it)->layerNode()->nextNodes().size());
// return upn->sortNumber().toDouble() - node->sortNumber().toDouble() + trans_val;
// }
// return upn->sortNumber().toDouble() - node->sortNumber().toDouble();
// });
//
// return std::accumulate(lev_rst.begin(), lev_rst.end(), 0.0);
//}
void dags::DAGGraph::primitiveGraphLayout() {
QList<std::shared_ptr<DAGLayerHelper>> sort_seqs;
@ -561,7 +503,7 @@ void dags::DAGGraph::backwardsLayoutImpls() {
}
void dags::DAGGraph::adjustLayoutImpls() {
//this->graph_springs_layout_forward(this->node_with_layout);
}

View File

@ -102,15 +102,6 @@ namespace dags {
void nodes_sort_with_above(int curr_layer, const QList<std::shared_ptr<DAGOrderHelper>>& total_nodes);
void nodes_sort_with_belows(int curr_layer, const QList<std::shared_ptr<DAGOrderHelper>>& total_nodes);
//void graph_springs_layout_forward(const QList<std::shared_ptr<DAGOrderHelper>>& total_nodes);
//QList<std::shared_ptr<DAGOrderHelper>> nodes_revise_forward_within_layer(int layer_index, const QList<std::shared_ptr<DAGOrderHelper>>& nodes);
//double node_revise_via_upstream(const QList<std::tuple<std::shared_ptr<DAGOrderHelper>, double>>& prev_nodes, std::shared_ptr<DAGOrderHelper> node);
//bool current_nodelist_filling_springs(const QList<std::shared_ptr<DAGOrderHelper>>& ordered_nodes);
//bool node_adjust_inlayer_forward(int curr_layer, const QList<std::shared_ptr<DAGOrderHelper>>& total_nodes);
//std::pair<qlonglong, qlonglong> node_evaluate_with_downstream(std::shared_ptr<DAGOrderHelper> node, const QList<std::shared_ptr<DAGOrderHelper>>& total_nodes);
//std::pair<qlonglong, qlonglong> node_evaluate_with_upstream(std::shared_ptr<DAGOrderHelper> node, const QList<std::shared_ptr<DAGOrderHelper>>& total_nodes);
};
}