Merge pull request #1079 from clulab/kwalcock/appsFixes

Fix naming convention problems

shell

@@ -1,2 +1,2 @@
 #!/bin/bash
-sbt 'runMain org.clulab.wm.eidos.apps.EidosShell'
+sbt 'runMain org.clulab.wm.eidos.apps.shell.EidosShell'

shell.bat

@@ -1 +1 @@
-sbt "runMain org.clulab.wm.eidos.apps.EidosShell"
+sbt "runMain org.clulab.wm.eidos.apps.shell.EidosShell"

src/main/resources/org/clulab/wm/eidos/apps/apps.conf

@@ -23,15 +23,15 @@ apps {
 
 
   groundAs = ["wm_compositional", "wm_flattened"]
-  ontologymapper {
+  ontologyMapper {
     dir = ./src/main/resources/org/clulab/wm/eidos/english/ontologies
     // groundTopN = 2 // TODO: remove from here
-    // outfile = ${apps.ontologymapper.dir}/wm_to_edited_MaaS_model.tsv
-    outfile = ${apps.ontologymapper.dir}/wm_to_MaaS_parameter.tsv
-    // outfile = ${apps.ontologymapper.dir}/wm_to_MaaS_variable.tsv
+    // outfile = ${apps.ontologyMapper.dir}/wm_to_edited_MaaS_model.tsv
+    outfile = ${apps.ontologyMapper.dir}/wm_to_MaaS_parameter.tsv
+    // outfile = ${apps.ontologyMapper.dir}/wm_to_MaaS_variable.tsv
   }
 
-  groundinginsight {
+  groundingInsight {
     ontologyPath = /org/clulab/wm/eidos/english/ontologies/CompositionalOntology_metadata.yml
     topk = 5
   }

src/main/scala/org/clulab/wm/eidos/exporters/CompositionalGroundingSheetExporter.scala

@@ -23,9 +23,9 @@ class CompositionalGroundingSheetExporter(filename: String, reader: EidosSystem,
   private val canonicalizer = currHandler.canonicalizer
   private val proc = reader.components.procOpt.get
   private val builder = new PosNegTreeDomainOntologyBuilder(proc, canonicalizer, filter = true)
-  private val ontology = builder.buildFromPath(config.getString("groundinginsight.ontologyPath"))
+  private val ontology = builder.buildFromPath(config.getString("apps.groundingInsight.ontologyPath"))
   private val nodes = ontology.ontologyNodes.map(n => (n.fullName, n)).toMap
-  private val k: Int = config.getInt("groundinginsight.topk")
+  private val k: Int = config.getInt("apps.groundingInsight.topk")
 
 
 

src/main/scala/org/clulab/wm/eidos/exporters/GroundingInsightExporter.scala

@@ -23,9 +23,9 @@ class GroundingInsightExporter(filename: String, reader: EidosSystem, config: Co
   private val canonicalizer = currHandler.canonicalizer
   private val proc = reader.components.procOpt.get
   private val builder = new PosNegTreeDomainOntologyBuilder(proc, canonicalizer, filter = true)
-  private val ontology = builder.buildFromPath(config.getString("apps.groundinginsight.ontologyPath"))
+  private val ontology = builder.buildFromPath(config.getString("apps.groundingInsight.ontologyPath"))
   private val nodes = ontology.ontologyNodes.map(n => (n.fullName, n)).toMap
-  private val k: Int = config.getInt("apps.groundinginsight.topk")
+  private val k: Int = config.getInt("apps.groundingInsight.topk")
 
 
 

src/main/scala/org/clulab/wm/eidos/groundings/OntologyMapper.scala

@@ -145,7 +145,7 @@ object OntologyMapper extends EidosConfigured {
 
   def mapIndicators(reader: EidosSystem): Unit = {
     // Update the indicator mapping file
-    val outputFile = config[String]("apps.ontologymapper.outfile")
+    val outputFile = config[String]("apps.ontologyMapper.outfile")
     val topN = config[Int]("apps.groundTopN")
     mapIndicators(reader, outputFile, topN)
   }