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 a0ea2373329034ae8ce9eb44d48e0131a334d5ef..7399f57761e45dd341407fbc12e2035ae5ce0bc4 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",