From 66afa98f49d376dd835fcedfc375bebe80c8caa6 Mon Sep 17 00:00:00 2001
From: Arvid Ihrig <ihrig@fhi-berlin.mpg.de>
Date: Thu, 25 Jan 2018 14:55:38 +0100
Subject: [PATCH] added normalizer version info, renamed folders
---
.../classify_structure.py | 0
.../setup_paths.py | 0
.../eu/nomad_lab/normalizers/SystemTypeNormalizer.scala | 9 ++++-----
3 files changed, 4 insertions(+), 5 deletions(-)
rename normalizer/{normalizer-systemType => normalizer-system-type}/classify_structure.py (100%)
rename normalizer/{normalizer-systemType => normalizer-system-type}/setup_paths.py (100%)
diff --git a/normalizer/normalizer-systemType/classify_structure.py b/normalizer/normalizer-system-type/classify_structure.py
similarity index 100%
rename from normalizer/normalizer-systemType/classify_structure.py
rename to normalizer/normalizer-system-type/classify_structure.py
diff --git a/normalizer/normalizer-systemType/setup_paths.py b/normalizer/normalizer-system-type/setup_paths.py
similarity index 100%
rename from normalizer/normalizer-systemType/setup_paths.py
rename to normalizer/normalizer-system-type/setup_paths.py
diff --git a/src/main/scala/eu/nomad_lab/normalizers/SystemTypeNormalizer.scala b/src/main/scala/eu/nomad_lab/normalizers/SystemTypeNormalizer.scala
index a0ea237..7399f57 100644
--- a/src/main/scala/eu/nomad_lab/normalizers/SystemTypeNormalizer.scala
+++ b/src/main/scala/eu/nomad_lab/normalizers/SystemTypeNormalizer.scala
@@ -23,15 +23,14 @@ object SystemTypeNormalizer extends ExternalNormalizerGenerator(
name = "SystemTypeNormalizer",
info = jn.JObject(
("name" -> jn.JString("SystemTypeNormalizer")) ::
- //TODO: ask Fawzi what to specify here
("parserId" -> jn.JString("SystemTypeNormalizer")) ::
("versionInfo" -> jn.JObject(
("nomadCoreVersion" -> jn.JObject(lab.NomadCoreVersionInfo.toMap.map {
case (k, v) => k -> jn.JString(v.toString)
- }(breakOut): List[(String, jn.JString)])) //::
- // (lab.SymmetryVersionInfo.toMap.map {
- // case (key, value) => key -> jn.JString(value.toString)
- // }(breakOut): List[(String, jn.JString)])
+ }(breakOut): List[(String, jn.JString)])) ::
+ (lab.SystemTypeVersionInfo.toMap.map {
+ case (key, value) => key -> jn.JString(value.toString)
+ }(breakOut): List[(String, jn.JString)])
)) :: Nil
),
context = "calculation_context",
--
GitLab