treat weighted epsilons as non-epsilons

Author: mr-martian

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.12 FATAL_ERROR)
 cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
 project(lttoolbox
-	VERSION 3.8.1
+	VERSION 3.8.2
 	LANGUAGES CXX C
 	)
 set(VERSION ${PROJECT_VERSION})

lttoolbox/transducer.cc

@@ -256,6 +256,7 @@ Transducer::closure_all(const int epsilon_tag) const
     c.insert(i);
     auto range = transitions.at(i).equal_range(epsilon_tag);
     for (; range.first != range.second; range.first++) {
+      if (range.first->second.second != default_weight) continue;
       c.insert(range.first->second.first);
       reversed[range.first->second.first].push_back(i);
     }
@@ -356,7 +357,7 @@ Transducer::determinize(int const epsilon_tag)
       {
         for(auto& it3 : transitions[it2])
         {
-          if(it3.first != epsilon_tag)
+          if(it3.first != epsilon_tag || it3.second.second != default_weight)
           {
             auto& it4 = all_closures[it3.second.first];
             mymap[std::make_pair(it3.first, it3.second.second)].insert(it4.begin(), it4.end());

tests/data/more-entry-weights.dix

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dictionary>
+  <alphabet>ABCDEFGHIJKLMNOPQRSTUVWXYZÀÁÂÄÅÆÇÈÉÊËÍÑÒÓÔÕÖØÙÚÜČĐŊŠŦŽabcdefghijklmnopqrstuvwxyzàáâäåæçèéêëíñòóôõöøùúüčđŋšŧž­-</alphabet>
+  <sdefs>
+    <sdef n="n"/>
+    <sdef n="vblex"/>
+    <sdef n="m"/>
+    <sdef n="pr"/>
+    <sdef n="def"/>
+    <sdef n="inf"/>
+    <sdef n="imp"/>
+    <sdef n="pp"/>
+    <sdef n="pprs"/>
+    <sdef n="ger"/>
+    <sdef n="subs"/>
+    <sdef n="pres"/>
+    <sdef n="past"/>
+    <sdef n="p3"/>
+    <sdef n="sg"/>
+    <sdef n="pl"/>
+    <sdef n="gen"/>
+  </sdefs>
+  <pardefs>
+	  <pardef n="liv/e__vblex">
+		  <e w="1"><p><l>e</l><r>e<s n="vblex"/><s n="inf"/></r></p></e>
+		  <e w="2"><p><l>e</l><r>e<s n="vblex"/><s n="imp"/></r></p></e>
+		  <e><p><l>ed</l><r>e<s n="vblex"/><s n="pp"/></r></p></e>
+		  <e w="1"><p><l>ing</l><r>e<s n="vblex"/><s n="pprs"/></r></p></e>
+		  <e w="3"><p><l>ing</l><r>e<s n="vblex"/><s n="ger"/></r></p></e>
+		  <e w="2"><p><l>ing</l><r>e<s n="vblex"/><s n="subs"/></r></p></e>
+		  <e><p><l>e</l><r>e<s n="vblex"/><s n="pres"/></r></p></e>
+		  <e><p><l>es</l><r>e<s n="vblex"/><s n="pres"/><s n="p3"/><s n="sg"/></r></p></e>
+		  <e><p><l>ed</l><r>e<s n="vblex"/><s n="past"/></r></p></e>
+	  </pardef>
+	  <pardef n="house__n">
+		  <e><p><l></l><r><s n="n"/><s n="sg"/></r></p></e>
+		  <e r="RL"><p><l>'s</l><r><s n="n"/><s n="sg"/><j/>'s<s n="gen"/></r></p></e>
+		  <e><p><l>s</l><r><s n="n"/><s n="pl"/></r></p></e>
+		  <e r="RL"><p><l>s'</l><r><s n="n"/><s n="pl"/><j/>'s<s n="gen"/></r></p></e>
+	  </pardef>
+  </pardefs>
+  <section id="main" type="standard">
+	  <e lm="house" w="1"><i>house</i><par n="house__n"/></e>
+	  <e lm="house" w="2"><i>hous</i><par n="liv/e__vblex"/></e>
+  </section>
+</dictionary>

tests/lt_comp/__init__.py

@@ -113,3 +113,9 @@ class RestrictRL2(RestrictTest):
     restrictflags = ['-v', 'oci']
     inputs = ['abc', 'ab']
     expectedOutputs = ['^abc/*abc$', '^ab/abbb<n><ind>$']
+
+class ConflictingEntryWeights(ProcTest):
+    procflags = ['-W']
+    procdix = 'data/more-entry-weights.dix'
+    inputs = ['house']
+    expectedOutputs = ['^house/house<n><sg><W:1.000000>/house<vblex><pres><W:2.000000>/house<vblex><inf><W:3.000000>/house<vblex><imp><W:4.000000>$']