From 6bdff57d2b7ad3fe9a5c02cb6eac53d3713558a3 Mon Sep 17 00:00:00 2001
From: dmt <>
Date: Sun, 3 Nov 2019 20:44:28 +0100
Subject: [PATCH] Clean up reconstruction step.

---
 cml/domain/reconstruction.py | 38 ++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/cml/domain/reconstruction.py b/cml/domain/reconstruction.py
index 2042128..d6c2964 100644
--- a/cml/domain/reconstruction.py
+++ b/cml/domain/reconstruction.py
@@ -243,32 +243,32 @@ class Reconstructor:
 
             # check constraints
             if self._valid_reconstructed(trained_model, "conceptual"):
-                reliability = self.calc_reliability(
-                    trained_model, learnblock, krippen)
+                reliability = self.calc_reliability(trained_model, learnblock,
+                                                    krippen)
                 ###################################################################
                 self.logger.protocol("{:<20}: {}".format("Reliability", str(reliability)))
                 ###################################################################
                 if reliability >= self.settings.min_reliability:
                     if not meta:
-                        prag_meta_data = Metadata(
-                            "C",
-                            tier,
-                            next(self.free_id),
-                            learnblock.indexes,
-                            learnblock.columns(),
-                            learnblock.get_column_values("Z"),
-                            learnblock.min_timestamp,
-                            learnblock.max_timestamp,
-                            (model.subject, ),
-                            (".".join(["C", str(tier), learnblock.purpose]), )
+                        uid = ".".join([self.CONCEPTUAL_KNOWLEDGE_ABBREVIATION,
+                                        str(tier),
+                                        learnblock.purpose])
+                        meta = Metadata(self.CONCEPTUAL_KNOWLEDGE_ABBREVIATION,
+                                        tier,
+                                        self.NEXT_MODEL_COUNTER(tier),
+                                        learnblock.indexes,
+                                        learnblock.columns(),
+                                        learnblock.get_column_values("Z"),
+                                        learnblock.min_timestamp,
+                                        learnblock.max_timestamp,
+                                        (model.subject, ),
+                                        (uid, ))
+                    reliability_to_model[reliability].append(
+                        PragmaticMachineLearningModel(
+                            meta, trained_model, learnblock
                         )
-                    else:
-                        prag_meta_data = meta
+                    )
 
-                    reliability_to_model[reliability].append(
-                        PragmaticMachineLearningModel(prag_meta_data,
-                                                      trained_model,
-                                                      learnblock))
         return reliability_to_model
 
     def _reconstruct_procedural(self,
-- 
GitLab