updates

Author: Hepic

assignment.cpp

@@ -6,7 +6,7 @@
 #include "help_functions.h"
 #include "assignment.h"
 
-double loyd_assignment(const vector<const Curve*> &centroids, vector<vector<int> > &clusters, char *metric) {
+double loyd_assignment(const vector<const Curve*> &centroids, vector<vector<int> > &clusters, const char *metric) {
     double min_dist, dist, value = 0;
     int p_centr;
 
@@ -33,7 +33,7 @@ double loyd_assignment(const vector<const Curve*> &centroids, vector<vector<int>
     return value;
 }
 
-double range_search(const vector<HashTable> &hashtables, const vector<const Curve*> &centroids, vector<vector<int> > &clusters, double delta, char *metric) {
+double range_search(const vector<HashTable> &hashtables, const vector<const Curve*> &centroids, vector<vector<int> > &clusters, double delta, const char *metric) {
     vector<int> assignment((int)input_curves.size(), -1);
     vector<set<Curve> > R_closest_curves((int)centroids.size());
     vector<bool> grid_curves_found((int)centroids.size(), false), visited((int)input_curves.size(), false);
@@ -54,7 +54,7 @@ double range_search(const vector<HashTable> &hashtables, const vector<const Curv
     }
 
     double R = minim / 2.0;
-    
+
     while (1) {
         general_search(hashtables, delta, R, "classic", metric, R_closest_curves, centroids, grid_curves_found, visited);
         bool found = false;

assignment.h

@@ -7,7 +7,7 @@
 
 using namespace std;
 
-double loyd_assignment(const vector<const Curve*>&, vector<vector<int> >&, char*);
-double range_search(const vector<HashTable>&, const vector<const Curve*>&, vector<vector<int> >&, double, char*);
+double loyd_assignment(const vector<const Curve*>&, vector<vector<int> >&, const char*);
+double range_search(const vector<HashTable>&, const vector<const Curve*>&, vector<vector<int> >&, double, const char*);
 
 #endif

cluster.cpp

@@ -22,16 +22,17 @@ void clustering(const vector<HashTable> &hashtables, double delta, vector<double
 
     do {
         if (method_assign == 1) {
-            value = range_search(hashtables, centroids, clusters, delta, metric);
-        } else if (method_assign == 2) {
             value = loyd_assignment(centroids, clusters, metric);
+        } else if (method_assign == 2) {
+            value = range_search(hashtables, centroids, clusters, delta, metric);
         }
-        
+
         if (method_update == 1) {
             check = mean_frechet_update(centroids, clusters);
         } else if (method_update == 2) {
             check = PAM_update(centroids, value, clusters, metric);
         }
+
     } while(check);
 
     silhouette(centroids, clusters, silhouette_cluster); 

main.cpp

@@ -14,6 +14,7 @@ int method_init;
 int method_assign;
 int method_update;
 
+
 int main(int argc, const char *argv[]) {
     ios::sync_with_stdio(false);
     srand(time(NULL));
@@ -27,7 +28,7 @@ int main(int argc, const char *argv[]) {
     method_assign = atoi(get_arguments(argv, argc, "-assign"));
     method_update = atoi(get_arguments(argv, argc, "-update"));
 
-    //num_of_clusters = 3;
+    num_of_clusters = 3;
     global_k = 2;
     global_L = 3;
 
@@ -68,8 +69,10 @@ int main(int argc, const char *argv[]) {
     vector<vector<int> > clusters(num_of_clusters);
     vector<double> silhouette_cluster(num_of_clusters);
 
-    insert_curves_into_hashtables(hashtables, delta, "classic");
-    
+    if (method_assign == 2) {
+        insert_curves_into_hashtables(hashtables, delta, "classic");
+    }
+
     clock_t begin = clock();
     clustering(hashtables, delta, silhouette_cluster, centroids, clusters, metric);
     clock_t end = clock();