added -no-ranking option for situations where ranking is not needed

Author: aarneranta

Makefile

@@ -101,13 +101,13 @@ parallel:
 	cat test/exx.dk >>tmp/parallel.dk
 	cat test/sets.dk >>tmp/parallel.dk
 	cat test/top100.dk >>tmp/parallel.dk
-	$(RUN) -parallel-data tmp/parallel.dk >tmp/parallel-informath.jsonl
+	$(RUN) -parallel-data -variations -no-ranking tmp/parallel.dk >tmp/parallel-informath.jsonl
 
 parallel-def:
 	tail -150 src/BaseConstants.dk >tmp/parallel.dk
 	cat test/exx.dk >>tmp/parallel.dk
 	cat test/sets.dk >>tmp/parallel.dk
-	$(RUN) -parallel-data -no-unlex -dedukti-tokens tmp/parallel.dk >tmp/parallel-def-train.jsonl
+	$(RUN) -parallel-data  -variations -no-ranking -no-unlex -dedukti-tokens tmp/parallel.dk >tmp/parallel-def-train.jsonl
 
 matita:
 	$(RUN) test/mini-matita.dk

app/RunInformath.hs

@@ -68,6 +68,8 @@ helpMsg4 = unlines [
   just "-nbest=<int>" "show <int> best NLG results",
   just "-to-latex-doc" "print valid LaTeX doc with preamble",
   just "-weights=<ints>" "weights of scores, default 1,1,1,1,1,1,1",
+  just "-no-ranking" "do not rank the NLG results (which can be expensive)",
+  just "-test-ambiguity" "test ambiguity when ranking NLG results (can be very slow)",
   just "-parallel-data" "print complete parallel data in jsonl",
   just "-to-lang=<lang>" "linearize to natural language <lang>",
   just "-to-formalism=<formalism>" "convert to <formalism> instead of natural language",
@@ -77,7 +79,6 @@ helpMsg4 = unlines [
   just "-from-lang=<lang>" "parse from <lang>",
   just "-translate" "translate text without parsing parts in $...$",
   just "-unknown-words" "show idents in text file not in grammar",
-  just "-test-ambiguity" "test ambiguity when ranking NLG results",
   "",
   "* General output options:",
   "",

src/Ranking.hs

@@ -18,6 +18,10 @@ data Scores = Scores {
   extra_parses :: Int
   } deriving Show
 
+-- for cases where (possibly expensive) scoring is not needed
+noScores :: Scores
+noScores = Scores 0 0 0 0 0 0 0
+
 scoreString :: Env -> String -> Scores
 scoreString env s = Scores {
   tree_length = 0, -- computed separately
@@ -71,6 +75,9 @@ scoreTreeAndString env (t, s) =
 
 -- sorts trees from lowest to highest total score
 rankTreesAndStrings :: Env -> [(Expr, String)] -> [((Expr, String), (Scores, Int))] 
-rankTreesAndStrings env tss = sortOn (snd . snd) [(ts, scoreTreeAndString env ts) | ts <- tss]
+rankTreesAndStrings env tss =
+  if isFlag "-no-ranking" env
+  then [(ts, (noScores, 0)) | ts <- tss]
+  else sortOn (snd . snd) [(ts, scoreTreeAndString env ts) | ts <- tss]