Merge pull request #11 from erikdab/improve-rl

Improve rl

conf/conf.ini

@@ -8,18 +8,22 @@ uid=plwn-sql
 db-file=~/repos/WordnetLoom/config/db/Local.properties
 
 [target2]
-uid=plwn-sql
-db-file=~/repos/WordnetLoom/config/db/Local.properties
+uid=pwn-nltk
 
 [relaxer]
-; comma seperated list of constraints to apply.
-constraints=ii
-weights_ii=0,0,0
-; comma seperated list of parts of speech (options: n, v, a, )
+; comma seperated list of parts of speech (options: n, v, a, r)
 pos=n
+; comma seperated list of constraints to apply.
+constraints=hyper_hypo,daughters,words,glosses
 
-; Weights for constraints, key is the Constraint.id()
+; Weights for constraints, key is the Constraint.uid()
+; If just single weight, use this.
 [weights]
+words=0
+glosses=0
+; If multiple information, use this
+[hyper_hypo]
+active=ii,ai
 iie=0
 iio=0
 iib=0
@@ -29,12 +33,11 @@ aib=0
 aae=0
 aao=0
 aab=0
-daught_one=0
-daught_equal=0
-daught_diff=0
-antonyms=0
-words=0
-gloss=0
+[daughters]
+active=one
+one=0
+equal=0
+diff=0
 
 [translater]
 type=cascade

data/pos.txt

@@ -1,4 +1,3 @@
-
 id	char name	fullname	domain_ids
 0	0   unknown	nieznana	49;3;37;7;16;34;32;40;42;31;36;28;8;12;4;35;46;14;29;23;45;13;25;15;44;18;43;10;21;22;39;1;20;38;17;27;41;26;47;9;33;6;11;19;30;5;24
 1	v   verb	czasownik	49;37;34;32;40;42;31;36;35;29;43;39;38;41;33;30

pyrelaxmapper/commands.py

@@ -66,4 +66,4 @@ def make_relax(relaxer):
     click.secho('Running relaxation labeling.', fg='blue')
     relaxer.relax()
     click.secho('Done relaxation labeling.', fg='blue')
-    return relaxer
+    return relaxer

pyrelaxmapper/conf.py

@@ -32,6 +32,12 @@ def search_paths():
             click.get_app_dir(APPLICATION)]
 
 
+def ensure_dir(directory):
+    """File in directory."""
+    if not os.path.exists(directory):
+        os.makedirs(directory)
+    return directory
+
 def ensure_dir(directory):
     """File in directory."""
     if not os.path.exists(directory):
@@ -221,6 +227,9 @@ def load_properties(file):
     return config
 
 
+class Config:
+    """Application Configuration.
+
 class Config:
     """Application Configuration.
 
@@ -394,8 +403,5 @@ def results_dir(self):
     def clean_cache(self):
         clean_directory(self.cache_dir())
 
-    def file_candidates(self):
-        return '({} -> {}) Candidates'.format(self.source_wn().name(), self.target_wn().name())
-
-    def file_relaxer(self):
-        return '({} -> {}) Relaxer'.format(self.source_wn().name(), self.target_wn().name())
+    def mapping_group(self):
+        return '{} -> {}'.format(self.source_wn().name(), self.target_wn().name())