No commit message

eskirton · Feb 13, 2009 · c2880a0 · c2880a0
1 parent 70a4e2f
commit c2880a0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 15 deletions.
diff --git a/acotreewidth/trunk/include/acotreewidth/decomp.h b/acotreewidth/trunk/include/acotreewidth/decomp.h
@@ -162,7 +162,7 @@ template <class T> class DecompProblem : public OptimizationProblem, public Eval
     }
 
     double eval_solution(const std::vector<unsigned int> &solution) {
-      return 1.0 / elim_graph_->eval_ordering(solution);
+      return 1.0 / this->eval_tour(solution);
     }
 
     std::vector<unsigned int> perturbate(const std::vector<unsigned int> &solution) {
@@ -233,20 +233,8 @@ template <class T> class TreeDecompProblem : public DecompProblem<T> {
     }
 
     unsigned int compute_width(const std::vector<unsigned int> &tour) {
-      unsigned int width = 0;
       DecompProblem<T>::elim_graph_->rollback();
-      for(unsigned int i=0;i<tour.size();i++) {
-        unsigned int w = DecompProblem<T>::elim_graph_->get_degree(tour[i]);
-        DecompProblem<T>::elim_graph_->eliminate(tour[i]);
-        if(w > width) {
-          width = w;
-        }
-
-        if(tour.size()-i <= width) {
-          break;
-        }
-      }
-      return width;
+      return DecompProblem<T>::elim_graph_->eval_ordering(tour);
     }
 };
 

diff --git a/acotreewidth/trunk/lib/libaco.a b/acotreewidth/trunk/lib/libaco.a
diff --git a/acotreewidth/trunk/src/decomp.cpp b/acotreewidth/trunk/src/decomp.cpp
@@ -113,8 +113,11 @@ unsigned int EliminationGraph::eval_ordering(const std::vector<unsigned int> &or
     nr_eliminations__++;
     eliminated__[vertex] = true;
     vertex_neighbours_length = 0;
+
+    if(width > this->number_of_vertices()) {
+      break;
+    }
   }
-  this->rollback();
   delete[] vertex_neighbours;
   delete[] elim_positions;
   return width;