REfactoring: Renamed Class

scripts/Infrastructure/CorrectParameter.py

@@ -5,22 +5,7 @@ from scripts.Infrastructure.MPICall import MPI_Call
 from scripts.Infrastructure.Template import InstructionBlock
 
 
-class MPI_Call_Factory:
-
-    def mpi_send(self, *args):
-        return MPI_Call("MPI_Send",
-                        OrderedDict([("BUFFER", args[0]), ("COUNT", args[1]), ("DATATYPE", args[2]), ("SRC", args[3]),
-                                     ("TAG", args[4]), ("COMM", args[5])]),
-                        "1.0")
-
-    def mpi_recv(self, *args):
-        return MPI_Call("MPI_Recv",
-                        OrderedDict([("BUFFER", args[0]), ("COUNT", args[1]), ("DATATYPE", args[2]), ("SRC", args[3]),
-                                     ("TAG", args[4]), ("COMM", args[5]), ("STATUS", args[6])]),
-                        "1.0")
-
-
-class Correct_Parameter:
+class CorrectParameterFactory:
     # default params
     buf_size = 10
     dtype = ['int', 'MPI_INT']
@@ -54,7 +39,7 @@ class Correct_Parameter:
 
 # todo also for send and non default args
 def get_matching_recv(call):
-    correct_params = Correct_Parameter()
+    correct_params = CorrectParameterFactory()
     recv = MPI_Call_Factory().mpi_recv(
         correct_params.get("BUFFER"),
         correct_params.get("COUNT"),

scripts/errors/pt2pt/InvalidRank.py

@@ -3,7 +3,7 @@
 from scripts.Infrastructure.ErrorGenerator import ErrorGenerator
 from scripts.Infrastructure.InstructionBlock import InstructionBlock
 from scripts.Infrastructure.MPICallFactory import MPI_Call_Factory
-from scripts.Infrastructure.CorrectParameter import Correct_Parameter,get_matching_recv
+from scripts.Infrastructure.CorrectParameter import CorrectParameterFactory, get_matching_recv
 from scripts.Infrastructure.Template import TemplateManager
 
 
@@ -25,7 +25,7 @@ class Invalid_negative_rank_error(ErrorGenerator):
 
     def generate(self, i):
         tm = TemplateManager()
-        correct_params = Correct_Parameter()
+        correct_params = CorrectParameterFactory()
 
         tm.set_description("InvalidParam-Rank-MPI_Send", "Invalid Rank: %s" % self.invalid_ranks[i])