Add counters for single nodes and subtrees

Author: filikat

highs/ipm/hipo/factorhighs/Analyse.cpp

@@ -1286,6 +1286,7 @@ void Analyse::findTreeSplitting() {
       auto res_insert = tree_splitting_.insert({sn, {}});
       is_in_tree_splitting_[sn] = true;
       res_insert.first->second.type = NodeType::single;
+      num_single_++;
 
       // The children of this sn are either single nodes or head of subtrees.
       // Divide the head of subtrees in groups, so that each group has 1% to 2%
@@ -1299,6 +1300,8 @@ void Analyse::findTreeSplitting() {
         bool is_small = subtree_ops[child] <= small_thresh;
 
         if (is_small) {
+          num_subtrees_++;
+
           if (!current_nodedata) {
             auto res_insert = tree_splitting_.insert({child, {}});
             is_in_tree_splitting_[child] = true;
@@ -1489,6 +1492,8 @@ Int Analyse::run(Symbolic& S) {
   S.flops_ = dense_ops_;
   S.block_size_ = nb_;
   S.max_stack_size_ = max_stack_size_;
+  S.num_single_ = num_single_;
+  S.num_subtrees_ = num_subtrees_;
 
   // compute largest supernode
   std::vector<Int> sn_size(sn_start_.begin() + 1, sn_start_.end());

highs/ipm/hipo/factorhighs/Analyse.h

@@ -79,6 +79,8 @@ class Analyse {
 
   std::map<Int, NodeData> tree_splitting_;
   std::vector<bool> is_in_tree_splitting_;
+  Int num_single_{};
+  Int num_subtrees_{};
 
   std::vector<int64_t> stack_subtrees_{};
   int64_t max_stack_size_{};

highs/ipm/hipo/factorhighs/Symbolic.cpp

@@ -97,6 +97,10 @@ void Symbolic::print(const Log& log, bool verbose) const {
                << '\n';
     log_stream << textline("Number of tasks:")
                << integer(tree_splitting_.size()) << '\n';
+    log_stream << textline("Number of single nodes:") << integer(num_single_)
+               << '\n';
+    log_stream << textline("Number of subtrees:") << integer(num_subtrees_)
+               << '\n';
     log_stream << textline("Artificial nz:") << sci(artificial_nz_, 0, 1)
                << '\n';
     log_stream << textline("Artificial ops:") << sci(artificial_ops_, 0, 1)

highs/ipm/hipo/factorhighs/Symbolic.h

@@ -46,6 +46,7 @@ class Symbolic {
   Int sn_size_10_{};
   Int sn_size_100_{};
   int64_t max_stack_size_{};
+  Int num_single_, num_subtrees_;
 
   // Inverse permutation
   std::vector<Int> iperm_{};