Permalink
Browse files

Merge remote-tracking branch 'upstream/master'

  • Loading branch information...
mcelvg committed Nov 30, 2015
2 parents 337403c + 376540e commit c6494e4ecb4ab8243bd350986c109e68b18ab92f
Showing with 2 additions and 2 deletions.
  1. +1 −1 README.md
  2. +1 −1 src/main/java/edu/emory/clir/clearnlp/component/mode/dep/state/DEPStateBranch.java
View
@@ -1,7 +1,7 @@
# ClearNLP
<img align="right" src="http://mathcs.emory.edu/~choi/img/clearnlp-logo.png" width="85" height="85" style="padding-left:5px"/>
The ClearNLP project provides software and resources for natural language processing. The project is currently developed by the [Center for Language and Information Research](http://nlp.mathcs.emory.edu) at [Emory University](http://emory.edu). This project is under the [Apache 2](http://www.apache.org/licenses/LICENSE-2.0) license.
The ClearNLP project provides software and resources for natural language processing. The project started at the [Center for Computational Language and EducAtion Research](http://clear.colorado.edu), and is currently developed by the [Center for Language and Information Research](http://nlp.mathcs.emory.edu) at [Emory University](http://emory.edu). This project is under the [Apache 2](http://www.apache.org/licenses/LICENSE-2.0) license.
* [Guidelines](https://github.com/clir/clearnlp-guidelines).
* The latest version: [3.2.0](http://search.maven.org/#artifactdetails%7Cedu.emory.clir%7Cclearnlp%7C3.2.0%7Cjar).
@@ -37,7 +37,7 @@
public class DEPStateBranch extends AbstractDEPState implements DEPTransition
{
private ObjectObjectDoubleTriple<DEPArc[],List<StringInstance>> best_tree;
private PriorityQueue<DEPBranch> q_branches;
private PriorityQueue<DEPBranch> q_branches;
private boolean save_branch;
private int beam_size;
private int max_heads;

0 comments on commit c6494e4

Please sign in to comment.