SRL Annotator

build.sbt

@@ -3,8 +3,8 @@ import sbtrelease.ReleaseStateTransformations._
 
 scalaVersion in ThisBuild := "2.11.7"
 
-val cogcompNLPVersion = "3.0.71"
-val cogcompPipelineVersion = "0.1.25"
+val cogcompNLPVersion = "3.1.7"
+val lbjavaVersion = "1.2.27"
 val ccgGroupId = "edu.illinois.cs.cogcomp"
 val headerMsg =  """/** This software is released under the University of Illinois/Research and Academic Use License. See
                         |  * the LICENSE file in the root folder for details. Copyright (c) 2016
@@ -61,12 +61,12 @@ lazy val commonSettings = Seq(
   ),
   javaOptions ++= List("-Xmx11g"),
   libraryDependencies ++= Seq(
-    ccgGroupId % "LBJava" % "1.2.25" withSources,
+    ccgGroupId % "LBJava" % lbjavaVersion withSources,
     ccgGroupId % "illinois-core-utilities" % cogcompNLPVersion withSources,
-    "com.gurobi" % "gurobi" % "6.0",
+    "com.gurobi" % "gurobi" % "7.0.1",
     "org.apache.commons" % "commons-math3" % "3.0",
     "org.scalatest" % "scalatest_2.11" % "2.2.4",
-    "ch.qos.logback" % "logback-classic" % "1.1.7"
+    "ch.qos.logback" % "logback-classic" % "1.2.3"
   ),
   fork := true,
   connectInput in run := true,
@@ -95,14 +95,14 @@ lazy val saulExamples = (project in file("saul-examples")).
   settings(
     name := "saul-examples",
     libraryDependencies ++= Seq(
-      ccgGroupId % "illinois-nlp-pipeline" % cogcompPipelineVersion withSources,
+      ccgGroupId % "illinois-nlp-pipeline" % cogcompNLPVersion withSources,
       ccgGroupId % "illinois-curator" % cogcompNLPVersion,
       ccgGroupId % "illinois-edison" % cogcompNLPVersion,
       ccgGroupId % "illinois-corpusreaders" % cogcompNLPVersion,
       ccgGroupId % "illinois-pos" % cogcompNLPVersion,
       ccgGroupId % "saul-pos-tagger-models" % "1.4",
       ccgGroupId % "saul-er-models" % "1.8",
-      ccgGroupId % "saul-srl-models" % "1.3",
+      ccgGroupId % "saul-srl-models" % "1.4" classifier "verb-gold",
       "org.json" % "json" % "20140107",
       "com.twitter" % "hbc-core" % "2.2.0",
       "org.rogach" %% "scallop" % "2.0.5"

saul-examples/src/main/scala/edu/illinois/cs/cogcomp/saulexamples/nlp/CommonSensors.scala

@@ -12,7 +12,7 @@ import edu.illinois.cs.cogcomp.core.datastructures.textannotation.{ Constituent,
 import edu.illinois.cs.cogcomp.curator.CuratorFactory
 import edu.illinois.cs.cogcomp.edison.features.factory.WordFeatureExtractorFactory
 import edu.illinois.cs.cogcomp.edison.features.{ FeatureExtractor, FeatureUtilities }
-import edu.illinois.cs.cogcomp.nlp.pipeline.IllinoisPipelineFactory
+import edu.illinois.cs.cogcomp.pipeline.main.PipelineFactory
 import edu.illinois.cs.cogcomp.saul.util.Logging
 import edu.illinois.cs.cogcomp.saulexamples.data.Document
 
@@ -87,9 +87,8 @@ object CommonSensors extends Logging {
   }
 
   def annotateWithPipeline(content: String, id: String): TextAnnotation = {
-    val annotatorService = IllinoisPipelineFactory.buildPipeline()
+    val annotatorService = PipelineFactory.buildPipeline()
     processDocumentWith(annotatorService, "corpus", id, content)
   }
-
 }
 

saul-examples/src/main/scala/edu/illinois/cs/cogcomp/saulexamples/nlp/QuestionTypeClassification/QuestionTypeClassificationSensors.scala

@@ -10,7 +10,7 @@ import java.io.File
 import java.util.Properties
 
 import edu.illinois.cs.cogcomp.core.datastructures.ViewNames
-import edu.illinois.cs.cogcomp.nlp.common.PipelineConfigurator._
+import edu.illinois.cs.cogcomp.pipeline.common.PipelineConfigurator._
 import edu.illinois.cs.cogcomp.saulexamples.nlp.TextAnnotationFactory
 
 import scala.io.Source
@@ -23,7 +23,9 @@ object QuestionTypeClassificationSensors {
 
   lazy val pipeline = {
     val settings = new Properties()
-    TextAnnotationFactory.disableSettings(settings, USE_SRL_NOM)
+    TextAnnotationFactory.enableSettings(settings, USE_POS, USE_DEP, USE_LEMMA, USE_SHALLOW_PARSE, USE_NER_CONLL,
+      USE_NER_ONTONOTES, USE_STANFORD_DEP, USE_STANFORD_PARSE, USE_SRL_VERB, USE_SRL_PREP, USE_SRL_COMMA,
+      USE_QUANTIFIER)
     TextAnnotationFactory.createPipelineAnnotatorService(settings)
   }
 

saul-examples/src/main/scala/edu/illinois/cs/cogcomp/saulexamples/nlp/SemanticRoleLabeling/GreedyDecoder.scala

@@ -0,0 +1,50 @@
+/** This software is released under the University of Illinois/Research and Academic Use License. See
+  * the LICENSE file in the root folder for details. Copyright (c) 2016
+  *
+  * Developed by: The Cognitive Computations Group, University of Illinois at Urbana-Champaign
+  * http://cogcomp.cs.illinois.edu/
+  */
+package edu.illinois.cs.cogcomp.saulexamples.nlp.SemanticRoleLabeling
+
+import edu.illinois.cs.cogcomp.core.datastructures.textannotation.Relation
+import edu.illinois.cs.cogcomp.lbjava.classify.{ Score, ScoreSet }
+
+import scala.collection.mutable
+
+// Note: Targeted to in PredicateArgumentViews only.
+// Used in SRL Annotation.
+object GreedyDecoder {
+  def decodeNoOverlap(inputRelationWithScores: Seq[(Relation, ScoreSet)], labelsToExclude: Set[String] = Set.empty): Seq[(Relation, Score)] = {
+    val filterExcludes = inputRelationWithScores.map({
+      case (relation, scoreset) =>
+        val highScoreLabel = scoreset.highScoreValue()
+        (relation, scoreset.getScore(highScoreLabel))
+    }).filterNot(x => labelsToExclude.contains(x._2.value))
+
+    if (filterExcludes.isEmpty) {
+      return Seq.empty
+    }
+
+    val minSpan = filterExcludes.map(_._1.getTarget.getStartSpan).min
+    val maxSpan = filterExcludes.map(_._1.getTarget.getEndSpan).max
+
+    val range = maxSpan - minSpan + 1
+    val spanPosition = new mutable.BitSet(range)
+
+    // Check if the sorting is stable
+    filterExcludes.sortBy(x => -x._2.score) // Sort from largest to lowest scores
+      .flatMap({
+        case (relation, score) =>
+          val startSpan = relation.getTarget.getStartSpan
+          val endSpan = relation.getTarget.getEndSpan - 1
+          val hasOverlap = (startSpan to endSpan).exists(sp => spanPosition.contains(sp - minSpan))
+
+          if (!hasOverlap) {
+            spanPosition ++= Range(startSpan - minSpan, endSpan - minSpan + 1)
+            Some((relation, score))
+          } else {
+            None
+          }
+      })
+  }
+}