Fixed errors

Author: gferrate

classification/trainer.py

@@ -26,8 +26,8 @@ def __init__(self, port, n_frames, client_id, num_clients, data_split_type):
         self.client_id = client_id
         self.num_clients = num_clients
         self.data_split_type = data_split_type
-        self.logger = 'logs/{}.log'.format(self.client_id)
-        self.init_logger()
+        #self.logger = 'logs/{}.log'.format(self.client_id)
+        #self.init_logger() # Logged from parent
         self.metaFile = self.get_meta_file()
 
     def get_meta_file(self):
@@ -238,8 +238,8 @@ def __init__(self,
                  port,
                  n_frames,
                  num_clients,
+                 client_id,
                  data_split_type):
-        client_id = 'sec_agg'
         super().__init__(port,
                          n_frames,
                          client_id,

client/client.py

@@ -5,7 +5,9 @@
 
 class Client:
 
-    def __init__(self, client_number, port, num_clients, split_type, client_id):
+    def __init__(self, port, n_frames,
+                 client_number, num_clients, split_type, client_id):
+        self.n_frames = n_frames
         self.split_type = split_type
         self.client_number = client_number
         self.port = port
@@ -18,10 +20,12 @@ def init_model(self):
             del self.trainer
         except:
             pass
-        self.trainer = trainer.ClientTrainer(self.client_number,
-                                             self.client_id,
+        self.trainer = trainer.ClientTrainer(self.port,
+                                             self.n_frames,
+                                             self.client_number,
                                              self.num_clients,
-                                             self.split_type)
+                                             self.split_type,
+                                             self.client_id)
 
     def train(self):
         self.trainer.train()

secure_aggregator/sec_agg.py

@@ -10,12 +10,12 @@
 
 class SecAgg:
 
-    def __init__(self, port, num_clients, split_type):
+    def __init__(self, port, n_frames, num_clients, split_type):
+        self.n_frames = n_frames
         self.init_logger()
         self.port = port
         self.num_clients = num_clients
         self.split_type = split_type
-        # TODO: Num clients don't have to be in SecAgg
         self.client_id = 'client_{}'.format(self.port)
         self.client_models_folder = 'secure_aggregator/client_models'
         self.init_model()
@@ -32,8 +32,10 @@ def init_logger(self):
         )
 
     def init_model(self):
-        self.trainer = trainer.SecAggTrainer(self.client_id,
+        self.trainer = trainer.SecAggTrainer(self.port,
+                                             self.n_frames,
                                              self.num_clients,
+                                             self.client_id,
                                              self.split_type)
 
     def load_models(self):