Skip to content

Commit 7a9eba7

Browse files
cowchipkidcowchipkid
authored
Merge branch 'master' into neuralnet
2 parents cb10189 + 9a13959 commit 7a9eba7

File tree

25 files changed

+425
-508
lines changed

25 files changed

+425
-508
lines changed

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Learning Based Java
22

3-
[![Build Status](https://semaphoreci.com/api/v1/projects/02a1d3da-4dc5-41c0-963c-b5605e4abc67/605145/badge.svg)](https://semaphoreci.com/danyaljj/lbjava)
3+
[![Build Status](https://semaphoreci.com/api/v1/cogcomp/lbjava-2/branches/master/badge.svg)](https://semaphoreci.com/cogcomp/lbjava-2)
4+
[![Build status](https://ci.appveyor.com/api/projects/status/vql7prdpsayqe2qb/branch/master?svg=true)](https://ci.appveyor.com/project/bhargavm/lbjava/branch/master)
45

56
- [LBJava core](lbjava/README.md)
67
- [LBJava examples](lbjava-examples/README.md)

‎lbjava-examples/pom.xml‎

Lines changed: 4 additions & 4 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.24</version>
6+
<version>1.2.26</version>
77
</parent>
88

99
<modelVersion>4.0.0</modelVersion>
@@ -27,12 +27,12 @@
2727
<dependency>
2828
<groupId>edu.illinois.cs.cogcomp</groupId>
2929
<artifactId>LBJava</artifactId>
30-
<version>1.2.24</version>
30+
<version>1.2.26</version>
3131
</dependency>
3232
<dependency>
3333
<groupId>edu.illinois.cs.cogcomp</groupId>
3434
<artifactId>lbjava-maven-plugin</artifactId>
35-
<version>1.2.24</version>
35+
<version>1.2.26</version>
3636
</dependency>
3737
</dependencies>
3838

@@ -63,7 +63,7 @@
6363
<plugin>
6464
<groupId>edu.illinois.cs.cogcomp</groupId>
6565
<artifactId>lbjava-maven-plugin</artifactId>
66-
<version>1.2.24</version>
66+
<version>1.2.26</version>
6767
<configuration>
6868
<gspFlag>${project.basedir}/src/main/java</gspFlag>
6969
<dFlag>${project.basedir}/target/classes</dFlag>

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
#
1+
---
2+
title: Badges
3+
authors: Vivek Srikumar, Stephen Mayhew, Daniel Khashabi
4+
lead: Classify a simple dataset of names
5+
layout: page
6+
---
27

38
This a sample classification project based on Learning Based Java (LBJava).
49

5-
Author: Vivek Srikumar
6-
Updated: Stephen Mayhew, Daniel Khashabi
7-

‎lbjava-examples/src/main/java/edu/illinois/cs/cogcomp/lbjava/examples/entityRelation/README.md‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
# Entity Relation Classification
1+
---
2+
title: Entity Relation Classification
3+
authors: Hao Wu, Parisa Kordjamshidi, Daniel Khashabi
4+
layout: page
5+
lead: Build a simple classifier for entities and relations
6+
---
7+
28
This a sample classification project based on Learning Based Java (LBJava).
39

410
## Details
@@ -8,5 +14,4 @@ The specifications are included in the file
814
This file contains a joint inference model, for applying constraints between labels of
915
entity-classifiers and relation classifiers.
1016

11-
## Credits
12-
Hao Wu, Parisa Kordjamshidi, Daniel Khashabi
17+

‎lbjava-examples/src/main/java/edu/illinois/cs/cogcomp/lbjava/examples/newsgroup/README.md‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
#
1+
---
2+
title: NewsGroup classification
3+
authors: Vivek Srikumar, Stephen Mayhew, Daniel Khashabi
4+
lead: Build a text classifier for the 20 NewsGroups dataset.
5+
layout: page
6+
---
27

38
This a sample classification project based on Learning Based Java (LBJava).
49

5-
Author: Vivek Srikumar
6-
Updated: Stephen Mayhew, Daniel Khashabi
710

‎lbjava-examples/src/main/java/edu/illinois/cs/cogcomp/lbjava/examples/regression/README.md‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
# Regression Example
1+
---
2+
title: Regression Example
3+
authors: Yiming Jiang
4+
lead: See how to use LBJava for regression
5+
layout: page
6+
---
27

38
This is a sample regression project using Stochastic Gradient Descent learning algorithm.
49

510
It shows how to define `.lbj` file with `real` type and how to use learning algorithms with `real` output.
6-
7-
Author: Yiming Jiang

‎lbjava-examples/src/main/java/edu/illinois/cs/cogcomp/lbjava/examples/sentiment/README.md‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
#
1+
---
2+
title: Sentiment Classifier
3+
layout: page
4+
author: Vivek Srikumar, Stephen Mayhew, Daniel Khashabi
5+
lead: Sentiment analysis in LBJava
6+
---
27

38
This a sample classification project based on Learning Based Java (LBJava).
49

5-
Author: Vivek Srikumar
6-
Updated: Stephen Mayhew, Daniel Khashabi
710

‎lbjava-examples/src/main/java/edu/illinois/cs/cogcomp/lbjava/examples/setCover/README.md‎

Lines changed: 32 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
# Set Cover problem
1+
---
2+
title: Set Cover Problem
3+
layout: page
4+
lead: Solve the set cover problem
5+
authors: Daniel Khashabi
6+
---
27

38
## Description
49
This tarball contains the LBJ implementation of the solution to a set cover
@@ -7,7 +12,7 @@ the problem is formulated as an Integer Linear Program. In LBJ, we'll write
712
the constraints in First Order Logic, and they'll be translated into the same
813
linear inequalities shown on the web page:
914

10-
http://mat.gsia.cmu.edu/orclass/integer/node8.html
15+
`http://mat.gsia.cmu.edu/orclass/integer/node8.html`
1116

1217
Classes City and Neighborhood are used as the internal representation of our
1318
problem's data. An instance of class City will become the "head" object of an
@@ -24,24 +29,37 @@ operates similarly to ContainsStation except that it respects the constraints.
2429
SetCoverSolver is a program that takes raw data representing a City as input
2530
and produces the constrained predictions.
2631

27-
=== How to run ===
28-
To run:
29-
./test.sh
32+
## How to run
33+
To run:
3034

31-
To clean:
32-
./clean.sh
35+
```
36+
./test.sh
37+
```
38+
39+
To clean:
3340

41+
```
42+
./clean.sh
43+
```
3444

3545
Note: You need to have Gurobi, the optimization package installed on your computer.
36-
You can download it from: www.gurobi.com, and set a global variable in ~/.bashrc, pointing to the Gurobi:
37-
export GUROBI_HOME=/shared/austen/khashab2/Gurobi/gurobi603/linux64
38-
export PATH="${PATH}:${GUROBI_HOME}/bin"
39-
export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${GUROBI_HOME}/lib"
46+
You can download it from: www.gurobi.com, and set a global variable in `~/.bashrc`, pointing to the Gurobi:
47+
48+
```
49+
export GUROBI_HOME=/shared/austen/khashab2/Gurobi/gurobi603/linux64
50+
export PATH="${PATH}:${GUROBI_HOME}/bin"
51+
export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${GUROBI_HOME}/lib"
52+
```
53+
4054
You also need to get the Gurobi license and put it somewhere on your machine.
41-
export GRB_LICENSE_FILE=ADDRESS_TO_LICENSE_FILE
4255

56+
```
57+
export GRB_LICENSE_FILE=ADDRESS_TO_LICENSE_FILE
58+
```
59+
60+
## Files In This Project
4361

44-
=== Files In This Project ===
62+
```
4563
├── class
4664
├── clean.sh
4765
├── example.txt
@@ -61,4 +79,4 @@ You also need to get the Gurobi license and put it somewhere on your machine.
6179
│   ├── Neighborhood.java
6280
│   └── SetCoverSolver.java
6381
└── test.sh
64-
82+
```

‎lbjava-examples/src/main/java/edu/illinois/cs/cogcomp/lbjava/examples/spam/README.md‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,12 @@
1-
# Spam Classification
2-
TODO
1+
---
2+
title: Spam Classification
3+
layout: page
4+
lead: Classify documents as spam or ham using LBJava
5+
author: Stephen Mayhew
6+
---
7+
8+
Coming soon!
9+
10+
{% highlight java %}
11+
{% include_relative SpamClassifierApplication.java %}
12+
{% endhighlight %}

‎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.24</version>
8+
<version>1.2.26</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.24</version>
79+
<version>1.2.26</version>
8080
<type>jar</type>
8181
<scope>compile</scope>
8282
</dependency>

0 commit comments

Comments
 (0)