fixed segmentation faults in ACSAntColony implementation.

eskirton · Aug 13, 2008 · 18441f2 · 18441f2
1 parent 1d737b1
commit 18441f2
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 3 deletions.
diff --git a/acotreewidth/trunk/lib/libaco.a b/acotreewidth/trunk/lib/libaco.a
diff --git a/acotsp/trunk/include/liblocalsearch/localsearch.h b/acotsp/trunk/include/liblocalsearch/localsearch.h
@@ -11,6 +11,7 @@ class Neighbourhood {
     virtual std::vector<unsigned int> get_solution() = 0;
     virtual bool has_next_neighbour_solution() = 0;
     virtual const std::vector<unsigned int> &next_neighbour_solution() = 0;
+    virtual void reset();
 };
 
 class TwoOptNeighbourhood : public Neighbourhood {
@@ -70,5 +71,5 @@ class IterativeLocalSearch {
     PerturbationFunction *perturbation_func_;
   public:
     IterativeLocalSearch(LocalSearch *local_search, PerturbationFunction *perturbation_func);
-    void run(int iterations=5);
+    void run(int iterations_without_improve=100, int ls_iteration_without_improve=10);
 };
diff --git a/acotsp/trunk/lib/libaco.a b/acotsp/trunk/lib/libaco.a
diff --git a/acotsp/trunk/lib/liblocalsearch.a b/acotsp/trunk/lib/liblocalsearch.a
diff --git a/libaco/trunk/src/ants.cpp b/libaco/trunk/src/ants.cpp
@@ -369,7 +369,7 @@ void ACSAnt::construct_pseudorandom_proportional_solution(OptimizationProblem &o
   //local pheromone update
   for(unsigned int i=0;i<tour->size();i++) {
     if(i==0) {
-      ((ACSPheromoneMatrix &) pheromones).local_pheromone_update(tour->size(), (*tour)[i]);
+      ((ACSPheromoneMatrix &) pheromones).local_pheromone_update(pheromones.size()-1, (*tour)[i]);
     } else {
       ((ACSPheromoneMatrix &) pheromones).local_pheromone_update((*tour)[i-1], (*tour)[i]);
     }
@@ -508,7 +508,7 @@ void ACSAntColony::update_pheromones() {
   std::vector<unsigned int> vertices = best_so_far_->get_vertices();
   for(unsigned int i=0;i<vertices.size();i++) {
     if(i==0) {
-      pheromones_->evaporate(vertices.size(), vertices[i]);
+      pheromones_->evaporate(pheromones_->size()-1, vertices[i]);
     } else {
       pheromones_->evaporate(vertices[i-1], vertices[i]);
     }