Removed h_idxs from prune function. Nothing has been tested

okkevaneck · okkevaneck · Oct 3, 2022 · May 21, 2021 · Jun 11, 2021 · Jul 14, 2021
commit ac84d2cce90894227700db04147d3b6affa43e41
diff --git a/archives/prospr_core.tar.gz b/archives/prospr_core.tar.gz
diff --git a/archives/prospr_core.zip b/archives/prospr_core.zip
diff --git a/prospr/core/src/depth_first_bnb.cpp b/prospr/core/src/depth_first_bnb.cpp
@@ -8,31 +8,28 @@
 #include <vector>
 #include <algorithm>
 #include <math.h>
+#include <numeric>
 
 
 namespace dfs_bnb {
-    // TODO: Change to use this->max_weights variables correctly instead of h_idxs!
     /* Returns true if the branch cannot produce a better score. */
     bool prune_branch(Protein protein, int max_length, int no_neighbors,
             int move, int best_score) {
         protein.place_amino(move);
 
         int cur_len = protein.get_cur_len();
         int cur_score = protein.get_score();
-        std::vector<int> h_idxs = protein.get_h_idxs();
+        std::vector<int> max_weights = protein.get_max_weights();
 
-        /* Compute the number of possible scoring connections for branch. */
-        std::vector<int>::iterator next_h_idx = std::lower_bound(h_idxs.begin(),
-                                                                  h_idxs.end(),
-                                                                  cur_len - 1);
-        int h_left = h_idxs.size() - (next_h_idx - h_idxs.begin());
-        int branch_score = -no_neighbors * h_left;
+        /* Compute the sum of the remaining possible scoring connections. */
+        int branch_score = -no_neighbors * \
+            std::accumulate(max_weights.begin() + cur_len, max_weights.end(), 0);
 
         /* End of amino has 1 more possible way of connecting, update
          * branch_score accordingly.
          */
-        if (cur_len != max_length && h_idxs.back() == max_length - 1)
-            branch_score--;
+        if (cur_len != max_length && max_weights.back() != 0)
+            branch_score -= max_weights.back();
 
         protein.remove_amino();
 

diff --git a/prospr/core/src/protein.cpp b/prospr/core/src/protein.cpp
@@ -157,6 +157,11 @@ int Protein::get_weight(std::string aminos) {
     }
 }
 
+/* Returns the vector with maximum achievable weights per amino acid. */
+std::vector<int> Protein::get_max_weights() {
+    return max_weights;
+}
+
 /* Reset all variables of a protein as if it was just initialized. */
 void Protein::reset() {
     space.clear();

diff --git a/prospr/core/src/protein.hpp b/prospr/core/src/protein.hpp
@@ -53,6 +53,9 @@ class Protein {
         /* Returns the weight created between two amino acids. */
         int get_weight(std::string aminos);
 
+        /* Returns the vector with maximum achievable weights per amino acid. */
+        std::vector<int> get_max_weights();
+
         /* Reset all variables of a protein as if it was just initialized. */
         void reset();
 
@@ -76,7 +79,6 @@ class Protein {
 
     private:
         std::string sequence;
-        std::vector<int> h_idxs;
         std::map<std::vector<int>, AminoAcid*> space;
         int cur_len;
         int dim;