Skip to content

Commit 00e963c

Browse files
author
Daniel Khashabi
authored
Merge branch 'master' into setterForConjunctiveLabels
2 parents 385daba + 8c9335a commit 00e963c

84 files changed

Lines changed: 5014 additions & 8774 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎lbjava-examples/pom.xml‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>lbjava-project</artifactId>
55
<groupId>edu.illinois.cs.cogcomp</groupId>
6-
<version>1.2.18</version>
6+
<version>1.2.22</version>
77
</parent>
88

99
<modelVersion>4.0.0</modelVersion>
@@ -27,17 +27,12 @@
2727
<dependency>
2828
<groupId>edu.illinois.cs.cogcomp</groupId>
2929
<artifactId>LBJava</artifactId>
30-
<version>1.2.18</version>
30+
<version>1.2.22</version>
3131
</dependency>
3232
<dependency>
3333
<groupId>edu.illinois.cs.cogcomp</groupId>
3434
<artifactId>lbjava-maven-plugin</artifactId>
35-
<version>1.2.18</version>
36-
</dependency>
37-
<dependency>
38-
<groupId>edu.illinois.cs.cogcomp</groupId>
39-
<artifactId>illinois-core-utilities</artifactId>
40-
<version>3.0.15</version>
35+
<version>1.2.22</version>
4136
</dependency>
4237
</dependencies>
4338

@@ -68,7 +63,7 @@
6863
<plugin>
6964
<groupId>edu.illinois.cs.cogcomp</groupId>
7065
<artifactId>lbjava-maven-plugin</artifactId>
71-
<version>1.2.18</version>
66+
<version>1.2.22</version>
7267
<configuration>
7368
<gspFlag>${project.basedir}/src/main/java</gspFlag>
7469
<dFlag>${project.basedir}/target/classes</dFlag>

‎lbjava-examples/src/main/java/edu/illinois/cs/cogcomp/lbjava/examples/badges/FeatureWeightCalculator.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
package edu.illinois.cs.cogcomp.lbjava.examples.badges;
99

1010
import edu.illinois.cs.cogcomp.lbjava.classify.Feature;
11-
import edu.illinois.cs.cogcomp.lbjava.classify.FeatureVector;
1211
import edu.illinois.cs.cogcomp.lbjava.classify.ScoreSet;
1312
import edu.illinois.cs.cogcomp.lbjava.learn.Lexicon;
1413

‎lbjava-examples/src/main/lbj/EntityRelation.lbj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import java.util.List;
44
import edu.illinois.cs.cogcomp.lbjava.examples.entityRelation.datastruct.*;
55
import edu.illinois.cs.cogcomp.lbjava.examples.entityRelation.Conll04_RelationReaderNew;
66

7-
import edu.illinois.cs.cogcomp.lbjava.infer.OJalgoHook;
7+
import edu.illinois.cs.cogcomp.infer.ilp.OJalgoHook;
88

99
discrete% EntityFeatures(ConllRawToken t) <- {
1010
sense t.POS;

‎lbjava-examples/src/main/lbj/SetCover.lbj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import edu.illinois.cs.cogcomp.lbjava.examples.setCover.City;
44
import edu.illinois.cs.cogcomp.lbjava.examples.setCover.Neighborhood;
55
import edu.illinois.cs.cogcomp.lbjava.examples.setCover.ContainsStation;
66

7-
import edu.illinois.cs.cogcomp.lbjava.infer.OJalgoHook;
7+
import edu.illinois.cs.cogcomp.infer.ilp.OJalgoHook;
88

99
constraint noEmptyNeighborhoods(City c) {
1010
forall (Neighborhood n in c.getNeighborhoods())

‎lbjava-mvn-plugin/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>lbjava-project</artifactId>
77
<groupId>edu.illinois.cs.cogcomp</groupId>
8-
<version>1.2.18</version>
8+
<version>1.2.22</version>
99
</parent>
1010

1111
<artifactId>lbjava-maven-plugin</artifactId>
@@ -76,7 +76,7 @@
7676
<dependency>
7777
<groupId>edu.illinois.cs.cogcomp</groupId>
7878
<artifactId>LBJava</artifactId>
79-
<version>1.2.18</version>
79+
<version>1.2.22</version>
8080
<type>jar</type>
8181
<scope>compile</scope>
8282
</dependency>

‎lbjava-mvn-plugin/src/main/java/edu/illinois/cs/cogcomp/CompileMojo.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import org.apache.maven.plugins.annotations.ResolutionScope;
2020

2121
/**
22-
* Compiles & executes LBJava code
22+
* Compiles &amp; executes LBJava code
2323
*
2424
*/
2525
@Mojo(name = "compile", requiresDependencyResolution = ResolutionScope.COMPILE)

‎lbjava/README.md‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,9 @@ NB: If you need to run `mvn clean` at any point, make sure to create `target/cla
5353
running `mvn compile/install` since it is required for the java-source compilation process.
5454

5555
## Using ILP inference
56-
LBJava uses the Gurobi solver for inference and therefore the Gurobi library needs to be installed
57-
prior to compilation. To download and install Gurobi visit [http://www.gurobi.com/](http://www.gurobi.com/)
58-
59-
Make sure to include Gurobi in your PATH and LD_LIBRARY variables
60-
```
61-
export GUROBI_HOME="PATH-TO-GUROBI/linux64"
62-
export PATH="${PATH}:${GUROBI_HOME}/bin"
63-
export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${GUROBI_HOME}/lib"
64-
```
65-
56+
LBJava uses the the solvers included in [illinois-inference](https://gitlab-beta.engr.illinois.edu/cogcomp/inference/) for
57+
inference. We refer the interested reader to the aforementioned library,
58+
for more details and instructions on how to install these libraries.
6659

6760
## Credits
6861
This project was started by [Nicholas Rizzolo](mailto:rizzolo@gmail.com).

‎lbjava/pom.xml‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>lbjava-project</artifactId>
55
<groupId>edu.illinois.cs.cogcomp</groupId>
6-
<version>1.2.18</version>
6+
<version>1.2.22</version>
77
</parent>
88

99
<modelVersion>4.0.0</modelVersion>
@@ -26,10 +26,9 @@
2626

2727
<dependencies>
2828
<dependency>
29-
<groupId>gurobi</groupId>
30-
<artifactId>gurobi</artifactId>
31-
<version>5.0.1</version>
32-
<optional>true</optional>
29+
<groupId>edu.illinois.cs.cogcomp</groupId>
30+
<artifactId>illinois-inference</artifactId>
31+
<version>0.6.0</version>
3332
</dependency>
3433
<dependency>
3534
<groupId>nz.ac.waikato.cms.weka</groupId>
@@ -47,11 +46,6 @@
4746
<version>4.11</version>
4847
<scope>test</scope>
4948
</dependency>
50-
<dependency>
51-
<groupId>org.ojalgo</groupId>
52-
<artifactId>ojalgo</artifactId>
53-
<version>37.1.1</version>
54-
</dependency>
5549
<dependency>
5650
<groupId>org.apache.commons</groupId>
5751
<artifactId>commons-math3</artifactId>

‎lbjava/src/main/java/edu/illinois/cs/cogcomp/lbjava/IR/AtLeastQuantifierExpression.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,9 @@
1414

1515

1616
/**
17-
* An "at least" quantifier has the form: <blockquote>
18-
* <code>atleast <i>expression</i> of <i>argument</i> in
19-
* (<i>expression</i>) <i>constraint-expression</i>
20-
* </blockquote>
21-
* where the first <code><i>expression</i></code> must evaluate to an <code>int</code>, the second
17+
* An "at least" quantifier has the form: <blockquote> <code>atleast </code> <i>expression</i> of
18+
* <i>argument</i> in (<i>expression</i>) <i>constraint-expression</i> </blockquote> where the first
19+
* <code><i>expression</i></code> must evaluate to an <code>int</code>, the second
2220
* <code><i>expression</i></code> must evaluate to a <code>Collection</code>, and the "at least"
2321
* quantifier expression is sastisfied iff when taking settings of <code><i>argument</i></code> from
2422
* the <code>Collection</code>, <code><i>constraint-expression</i></code> is satisfied at least as

‎lbjava/src/main/java/edu/illinois/cs/cogcomp/lbjava/IR/AtMostQuantifierExpression.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,9 @@
1414

1515

1616
/**
17-
* An "at most" quantifier has the form: <blockquote>
18-
* <code>atmost <i>expression</i> of <i>argument</i> in
19-
* (<i>expression</i>) <i>constraint-expression</i>
20-
* </blockquote>
21-
* where the first <code><i>expression</i></code> must evaluate to an <code>int</code>, the second
17+
* An "at most" quantifier has the form: <blockquote> <code>atmost</code> <i>expression</i> of
18+
* <i>argument</i> in (<i>expression</i>) <i>constraint-expression</i> </blockquote> where the first
19+
* <code><i>expression</i></code> must evaluate to an <code>int</code>, the second
2220
* <code><i>expression</i></code> must evaluate to a <code>Collection</code>, and the "at most"
2321
* quantifier expression is sastisfied iff when taking settings of <code><i>argument</i></code> from
2422
* the <code>Collection</code>, <code><i>constraint-expression</i></code> is satisfied at most as

0 commit comments

Comments
 (0)