Fixed another error in CompleteFullGraph class

Author: YNedderhoff

modules/graphs.py

@@ -90,7 +90,7 @@ def __init__(self, tokens):
             self.heads[0].append(new_arc)
         for token1 in tokens:
             dependents = []
-            for token2 in (token2 for token2 in tokens if token2.head == token1.id):
+            for token2 in (token2 for token2 in tokens if token2.id != token1.id):
                 new_arc = FullArc(token1.id, token2.id, token1.form, token2.form, token1.lemma, token2.lemma, \
                                   token1.pos, token2.pos, token2.rel)
                 dependents.append(new_arc)

modules/token.py

@@ -11,7 +11,10 @@ def __init__(self, line):
         self.form = entries[1]
         self.lemma = entries[2]
         self.pos = entries[3]
-        self.head = int(entries[6])
+        if entries[6] == "_":  # happens for test data, in that case it can't be 'integered'
+            self.head = None
+        else:
+            self.head = int(entries[6])
         self.rel = entries[7].rstrip()
 
 def sentences(file_stream):

start-cle.sh

@@ -11,10 +11,10 @@ EVALUATIONS="evaluations"
 #python -u dependency-parser.py -train -i $CORPORA/train/wsj_train.first-5k.conll06 -m model -e 1 -decrease-alpha -shuffle-sentences
 
 #train
-python -u dependency-parser.py -train -i ../dependency-parsing-files/data/english/train/wsj_train.conll06 -m $MODELS/m_e-10_da_ss -e 2 -decrease-alpha -shuffle-sentences
+#python -u dependency-parser.py -train -i ../dependency-parsing-files/data/english/train/wsj_train.conll06 -m $MODELS/m_e-10_da_ss -e 2 -decrease-alpha -shuffle-sentences
 
 #test
-#python -u dependency-parser.py -test -i $CORPORA/dev/wsj_dev.conll06 -m model -o predicted.conll06
+python -u dependency-parser.py -test -i $CORPORA/dev/wsj_dev_wit.conll06 -m model -o predicted.conll06
 #python -u dependency-parser.py -test -i $CORPORA/train/wsj_train.conll06 -m $MODELS/m_e-10_da_ss -o predicted.conll06
 
 #python -u dependency-parser.py -ev -i predicted.conll06 -g $CORPORA/dev/wsj_dev.conll06 -o evaluation_sentence.txt

start-cle_automated.sh

@@ -10,7 +10,7 @@ EVALUATIONS="evaluations"
 #python -u dependency-parser.py -train -i ${CORPORA}/train/wsj_train.conll06 -m ${MODELS}/$2 -e $1 $5 $6
 
 #test
-python -u dependency-parser.py -test -i ${CORPORA}/dev/wsj_dev.conll06 -m ${MODELS}/$2 -o ${PREDICTIONS}/$3".conll06"
+python -u dependency-parser.py -test -i ${CORPORA}/dev/wsj_dev_without_head.conll06 -m ${MODELS}/$2 -o ${PREDICTIONS}/$3".conll06"
 
 # sentence based evaluation
 python -u dependency-parser.py -ev -i ${PREDICTIONS}/$3".conll06" -g ${CORPORA}/dev/wsj_dev.conll06 -o ${EVALUATIONS}/$4"_sentence".txt