From ea1acd89ea599543c31d967c2d8acfbb935561cc Mon Sep 17 00:00:00 2001 From: bay9355 <mia.le@studium.uni-hamburg.de> Date: Sun, 17 Apr 2022 15:35:01 +0200 Subject: [PATCH] Added a TemplateWrapper for the integration of new Algorithms --- cami/TemplateWrapper.py | 10 ++++------ cami/preprocess.py | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/cami/TemplateWrapper.py b/cami/TemplateWrapper.py index 7171e02..9ab62c5 100644 --- a/cami/TemplateWrapper.py +++ b/cami/TemplateWrapper.py @@ -18,17 +18,15 @@ class TemplateWrapper(AlgorithmWrapper): The only instance variables that need to be defined for each tool individually are: - name (string): The name of the algorithm/tool - - code (int): A unique integer code for this tool. Choose any number that is not taken by other tools yet (currently taken are: 0,1,2,3) + - code (int): A unique integer code for this tool. Choose any number (<21) that is not taken by other tools yet (currently taken are: 0,1,2,3) - any constant numbers or variables that are defined in the config file for this tool """ super().__init__() - self.name = 'DIAMOnD' - self.code = 1 + self.name = '<tool_name>' + self.code = 4 config = ConfigParser() config.read(self.config) - self.alpha = int(config.get('diamond', 'alpha')) - self.pred_factor = int(config.get('diamond', 'pred_factor')) - self.max_preds = int(config.get('diamond', 'max_preds')) +# self.nof_predictions = int(config.get('<tool_name>', 'nof_predictions')) def run_algorithm(self, inputparams): """Execute the algorithm. Ideally the algorithm is a command line tool that takes diff --git a/cami/preprocess.py b/cami/preprocess.py index 96f7691..47f3a02 100644 --- a/cami/preprocess.py +++ b/cami/preprocess.py @@ -34,7 +34,7 @@ def csv2graph(inputfile, break g.vertex_properties["cami_score"] = g.new_vertex_property("float", val=0.0) - values = (nof_tools + 6) * [-1] + values = (20) * [-1] g.vertex_properties["predicted_by"] = g.new_vertex_property("vector<int16_t>", val=values) return g -- GitLab