modelfile as Option[InputStream]

clulab · Dec 20, 2018 · 5f4d00c · 5f4d00c
1 parent 4b41236
commit 5f4d00c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/main/scala/org/clulab/timenorm/neural/TemporalNeuralParser.scala b/src/main/scala/org/clulab/timenorm/neural/TemporalNeuralParser.scala
@@ -94,12 +94,12 @@ object TemporalNeuralParser {
 }
 
 
-class TemporalNeuralParser(modelFile: InputStream =
-                           getClass.getResourceAsStream("/org/clulab/timenorm/model/weights-improvement-22.dl4j.zip")) {
+class TemporalNeuralParser(modelFile: Option[InputStream] = None) {
   private type Entities = List[List[(Int, Int, String)]]
   private type Properties = List[List[(Int, String, String)]]
 
-  lazy private val network: ComputationGraph = ModelSerializer.restoreComputationGraph(modelFile, false)
+  lazy private val network: ComputationGraph = ModelSerializer.restoreComputationGraph(
+    modelFile.getOrElse(this.getClass.getResourceAsStream("/org/clulab/timenorm/model/weights-improvement-22.dl4j.zip")), false)
   lazy private val char2int = readDict(this.getClass.getResourceAsStream("/org/clulab/timenorm/vocab/dictionary.json"))
   lazy private val operatorLabels = Source.fromInputStream(this.getClass.getResourceAsStream("/org/clulab/timenorm/label/operator.txt")).getLines.toList
   lazy private val nonOperatorLabels = Source.fromInputStream(this.getClass.getResourceAsStream("/org/clulab/timenorm/label/non-operator.txt")).getLines.toList

diff --git a/src/main/scala/org/clulab/timenorm/neural/WordToNumber.scala b/src/main/scala/org/clulab/timenorm/neural/WordToNumber.scala
@@ -55,15 +55,14 @@ object WordToNumber {
         try {
           g += Small(w)
         } catch {
-          case e: NoSuchElementException => {
+          case e: NoSuchElementException =>
             if (w == "hundred" && g!=0)
               g *= 100L
             else {
               n += g * Magnitude(w)
               g = 0L
             }
           }
-        }
         (n + g).toString
       }
     } catch {