fiw signing mixtures

Author: quentinhaenn

radius_clustering/radius_clustering.py

@@ -102,7 +102,7 @@ def fit(self, X, y=None):
             self.effective_radius = 0
             self._mds_exec_time = 0
             return self
-        self.edges = np.argwhere(adj_mask).astype(np.int32) #TODO: changer en uint32
+        self.edges = np.argwhere(adj_mask).astype(np.uint32) #TODO: changer en uint32
         self.dist_mat = dist_mat
 
         self._clustering()

radius_clustering/utils/emos.pyx

@@ -17,7 +17,7 @@ cdef extern from "mds3-util.h":
         int set_size
         double exec_time
 
-    Result* emos_main(int* edges, int nb_edge, int n)
+    Result* emos_main(unsigned int* edges, int nb_edge, int n)
 
     void cleanup()
 
@@ -26,7 +26,7 @@ cdef extern from "mds3-util.h":
 import numpy as np
 cimport numpy as np
 
-def py_emos_main(np.ndarray[int, ndim=1] edges, int n, int nb_edge):
+def py_emos_main(np.ndarray[unsigned int, ndim=1] edges, int n, int nb_edge):
     cdef Result* result = emos_main(&edges[0], n, nb_edge)
 
     dominating_set = [result.dominating_set[i] - 1 for i in range(result.set_size)]

radius_clustering/utils/main-emos.c

@@ -1385,7 +1385,7 @@ void solve_subproblems(){
 static void print_final_solution(char *inst){
    printf("--------------------------------\n");
    printf("Solution: ");
-     for(int i=0;i<USED(VEC_SOLUTION);i++){
+     for(size_t i=0;i<USED(VEC_SOLUTION);i++){
      printf("%d ",ITEM(VEC_SOLUTION,i));
   }
       printf("\n");
@@ -1488,7 +1488,7 @@ void check_consistance(){
     assert(!domed(CFG[i]));
   }
   int level=-1;
-  for(int idx=0;idx<USED(BRA_STK);idx++){
+  for(size_t idx=0;idx<USED(BRA_STK);idx++){
     if(ITEM(BRA_STK,idx)==NONE){
       level++;
     }else if(idx<=BRAIDX[level])
@@ -1596,6 +1596,12 @@ void cleanup(){
   }
 }
 
+
+void handler(int sig) {
+  cleanup();
+  exit(sig);
+}
+
 #ifdef _WIN32
 static BOOL WINAPI win32_handler(DWORD signal) {
     if (signal == CTRL_C_EVENT) {
@@ -1614,12 +1620,8 @@ static void setup_signal_handler(void (*handler_fn)(int)) {
 }
 #endif
 
-void handler(int sig) {
-  cleanup();
-  exit(sig);
-}
 
-struct Result* emos_main(int* edges, int n, int nb_edge) {
+struct Result* emos_main(unsigned int* edges, int n, int nb_edge) {
 
     // Set the signal handler
   setup_signal_handler(handler);
@@ -1644,7 +1646,7 @@ struct Result* emos_main(int* edges, int n, int nb_edge) {
 
   // Get the results
   int* dominating_set = (int*)malloc(USED(VEC_SOLUTION) * sizeof(int));
-  for (int i= 0; i<USED(VEC_SOLUTION); i++) {
+  for (size_t i= 0; i<USED(VEC_SOLUTION); i++) {
     dominating_set[i] = ITEM(VEC_SOLUTION, i);
   }
 
@@ -1675,22 +1677,4 @@ void free_results(struct Result* result) {
         free(result);
     }
 }
-
-/** int main(int argc, char *argv[]) {
-
-  print_compile_options();
-  parse_parmerters(argc,argv);
-  if(read_instance(argv[1])) {
-    initialize();
-    #ifndef NOR
-    reduce_graph();
-    #endif
-    partition_oneproblem();    
-    solve_subproblems();
-    check_final_solution();
-    print_final_solution(getInstanceName(argv[1]));
-    printf("### %s pruning rate %0.2lf total %llu pruned %llu\n",getInstanceName(argv[1]), (total_branches-pruned_branches)/((double)total_branches),total_branches,total_branches-pruned_branches);
-  }	   
-  return 0;
-} */
 

radius_clustering/utils/mds3-util.h

@@ -342,7 +342,7 @@ static int _read_graph_from_adjacency_matrix(int** adj_matrix, int num_nodes) {
   return TRUE;
 }
 
-static int _read_graph_from_edge_list(int* edges, int n, int nb_edges) {
+static int _read_graph_from_edge_list(unsigned int* edges, int n, int nb_edges) {
   int i, j, l_node, r_node, nb_edge = 0, max_node = n, offset = 0;
   int node = 1;
 
@@ -765,7 +765,7 @@ extern int select_branching_node();
 extern void search_domset();
 extern int fast_search_initial_solution();
 extern void solve_subproblems();
-extern struct Result* emos_main(int* edges, int n, int nb_edge);
+extern struct Result* emos_main(unsigned int* edges, int n, int nb_edge);
 extern int* get_dominating_set(struct Result* result);
 extern int get_set_size(struct Result* result);
 extern double get_exec_time(struct Result* result);

radius_clustering/utils/mds_core.cpp

@@ -8,12 +8,10 @@
  */
 #include <vector>
 #include <unordered_set>
-#include <set>  // Add this line
 #include <algorithm>
 #include <random>
 #include <chrono>
 #include <cmath>
-#include <iostream>
 #include <csignal>
 #include <limits>
 #include "random_manager.h"
@@ -92,20 +90,8 @@ class Instance {
     std::unordered_set<int> supportNodes;
     std::unordered_set<int> leavesNodes;
     std::unordered_set<int> unSelectedNodes;
-    int optimum;
     const bool supportAndLeafNodes = true;
 
-    /*
-    void constructAdjacencyList(const std::vector<std::vector<int>>& adjacency_matrix) {
-        for (int i = 0; i < numNodes; ++i) {
-            for (int j = 0; j < numNodes; ++j) {
-                if (adjacency_matrix[i][j] == 1) {
-                    adjacencyList[i].push_back(j);
-                }
-            }
-        }
-    }*/
-
     void constructAdjacencyList(const std::vector<int>& edge_list, int nb_edges) {
         for (int i = 0; i < 2 * nb_edges; i+=2) {
             int u = edge_list[i];