Skip to content

Commit

Permalink
Merge pull request #13 from HumanBehaviourChangeProject/release-v5
Browse files Browse the repository at this point in the history 
Release v5
  • Loading branch information
@MartinGleize
MartinGleize authored Jul 7, 2021
2 parents 71ea066 + 2e6f9dd commit 689a039
Show file tree
Hide file tree
Showing 50 changed files with 51,404 additions and 1,182 deletions.
2 changes: 0 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
[![Build Status](https://staging.travis-ci.com/HumanBehaviourChangeProject/Info-extract.svg?branch=master)](https://staging.travis-ci.com/HumanBehaviourChangeProject/Info-extract)

# Human Behaviour Change Project (HBCP)

The Human Behaviour-Change Project (HBCP) is a collaboration between behavioral scientists, computer scientists and
Expand Down
140 changes: 63 additions & 77 deletions core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>ibm.research.drl</groupId>
<groupId>com.ibm.drl.hbcp</groupId>
<artifactId>hbcp-core</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>0.0.1</version>
<packaging>war</packaging>

<name>hbcp-core</name>
Expand Down Expand Up @@ -108,8 +108,8 @@
<artifactId>slf4j-jdk14</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</exclusion>
</exclusions>
</dependency>
Expand Down Expand Up @@ -144,10 +144,11 @@
<artifactId>lucene-classification</artifactId>
<version>8.1.1</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>27.1-jre</version>
<version>30.1.1-jre</version>
</dependency>
<dependency>
<groupId>org.apache.opennlp</groupId>
Expand All @@ -174,64 +175,64 @@
<version>1.18.16</version>
<scope>provided</scope>
</dependency>

<!-- Start tika-app -->
<!--
<dependency>
<!--
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-app</artifactId>
<version>1.24</version>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
</exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependency>
-->
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parsers</artifactId>
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parsers</artifactId>
<version>1.24</version>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-langdetect</artifactId>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-langdetect</artifactId>
<version>1.24</version>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-serialization</artifactId>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-serialization</artifactId>
<version>1.24</version>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-xmp</artifactId>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-xmp</artifactId>
<version>1.24</version>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-batch</artifactId>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-batch</artifactId>
<version>1.24</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependency>
<!-- End tika-app -->


Expand All @@ -240,20 +241,16 @@
<artifactId>lucene-highlighter</artifactId>
<version>8.1.1</version>
</dependency>
<dependency>
<groupId>net.minidev</groupId>
<artifactId>json-smart</artifactId>
<version>2.2.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<!-- PT: <version>2.9.8</version> -->
</dependency>
<!-- https://mvnrepository.com/artifact/com.thoughtworks.xstream/xstream -->
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<version>1.4.11.1</version>
<version>1.4.17</version>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
Expand Down Expand Up @@ -312,17 +309,6 @@
<artifactId>springfox-swagger-ui</artifactId>
<version>2.7.0</version>
</dependency>
<dependency>
<groupId>org.grobid</groupId>
<artifactId>grobid-core</artifactId>
<version>0.5.3</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>uk.com.robust-it</groupId>
<artifactId>cloning</artifactId>
Expand Down Expand Up @@ -358,16 +344,16 @@
<artifactId>glove</artifactId>
<version>0.3</version>
</dependency>
<!-- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
</dependency>
-->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</dependency>

<!-- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
</dependency>
-->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</dependency>

</dependencies>

Expand Down Expand Up @@ -577,7 +563,7 @@
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repository>
</repositories>

</project>
6 changes: 3 additions & 3 deletions core/src/main/java/com/ibm/drl/hbcp/api/ExtractorController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,11 +200,11 @@ protected String extractAll(
protected String extractAllMulti(
@ApiParam("Number of top passages to retrieve for aggregating the confidences of BCT presence")
@RequestParam(value="ntoppassages", required= false, defaultValue = "5") Integer numTopPassagesToRetrieve,
@ApiParam("A comma separated list of window sizes to use, e.g. '10,20'")
@ApiParam("A comma separated list of window sizes to use, e.g. '10,20', only useful if using the unsupervised baseline")
@RequestParam(value="wsizes", required= false, defaultValue = "10,20") String wsizes,
@ApiParam("A threshold value within the range of [0, 1] (e.g. 0.25)")
@ApiParam("A threshold value within the range of [0, 1] (e.g. 0.25), only useful if using the unsupervised baseline")
@RequestParam(value="threshold", required= false, defaultValue = "0.2") Float threshold,
@ApiParam("Whether to use an ABBYY XML file as input instead of a PDF (true to use ABBYY, false to use raw PDF")
@ApiParam("Whether to use an ABBYY XML file as input instead of a PDF (true to use ABBYY .pdf.xml, false to use raw PDF")
@RequestParam(value = "useAbbyy", required = false, defaultValue = "false") boolean useAbbyy,
@ApiParam("Whether to use the faster, less accurate unsupervised extraction algorithm")
@RequestParam(value = "useUnsupervisedBaseline", required = false, defaultValue = "false") boolean useUnsupervisedBaseline,
Expand Down
Loading

0 comments on commit 689a039

Please sign in to comment.