implab/ImplabNet Commit - r181:b2b6a6640aa3

minor fixes and debug

cin -

r181:b2b6a6640aa3 ref20160224

parent child

Context file:

r181:b2b6a6640aa3

Collapse all files

Implab/Automaton/DFATable.cs +10 -7

             using System;
             using System.Collections.Generic;
             using System.Linq;
+            using System.Diagnostics;
             namespace Implab.Automaton {
                 public class DFATable : IDFATableBuilder {
                     public void SetInitialState(int s) {
                         Safe.ArgumentAssert(s >= 0, "s");
+                        m_stateCount = Math.Max(m_stateCount, s + 1);
                         m_initialState = s;
                     }
                     public void MarkFinalState(int state) {
+                        m_stateCount = Math.Max(m_stateCount, state + 1);
                         m_finalStates.Add(state);
                     }
                         Safe.ArgumentAssert(item.edge >= 0, "item");
                         m_stateCount = Math.Max(m_stateCount, Math.Max(item.s1, item.s2) + 1);
-                        m_symbolCount = Math.Max(m_symbolCount, item.edge);
+                        m_symbolCount = Math.Max(m_symbolCount, item.edge + 1);
                         m_transitions.Add(item);
                     }
                         var table = new int[StateCount,AlphabetSize];
                         for (int i = 0; i < StateCount; i++)
-                            for (int j = 0; i < AlphabetSize; j++)
+                            for (int j = 0; j < AlphabetSize; j++)
                                 table[i, j] = AutomatonConst.UNREACHABLE_STATE;
                         foreach (var t in this)
                             .GroupBy(t => t.s2)
                             .ToDictionary(
                                 g => g.Key, // s2
-                                g => g.GroupBy(t => t.edge, t => t.s1).ToDictionary(p => p.Key)
+                                g => g.ToLookup(t => t.edge, t => t.s1)//.ToDictionary(p => p.Key)
                             );
                         while (queue.Count > 0) {
                             for (int c = 0; c < m_symbolCount; c++) {
                                 var stateX = new HashSet<int>();
-                                foreach(var a in stateA)
+                                foreach(var a in stateA.Where(rmap.ContainsKey))
                                     stateX.UnionWith(rmap[a][c]); // all states from wich the symbol 'c' leads to the state 'a'
                                 foreach (var stateY in optimalStates.ToArray()) {
                                     // ищем все переходы класса по символу term
                                     var res = m_transitions.Where(t => stateMap[t.s1] == s && t.edge == term).Select(t => stateMap[t.s2]).ToArray();
+                                    Debug.Assert(res.Length <= 1);
                                     var s2 = res.Length > 0 ? res[0] : -1;
                                     HashSet<int> a2;
                                 nextCls++;
                             // сохраняем DFAConst.UNCLASSIFIED_INPUT
-                            var cls = item.Contains(AutomatonConst.UNCLASSIFIED_INPUT) ? AutomatonConst.UNCLASSIFIED_INPUT : nextCls;
+                            var cls = item.Contains(AutomatonConst.UNCLASSIFIED_INPUT) ? AutomatonConst.UNCLASSIFIED_INPUT : nextCls++;
                             foreach (var a in item)
                                 alphabetMap[a] = cls;
-                            nextCls++;
                         }
                         // построение автомата

Implab/Automaton/MapAlphabet.cs +1 -1

                     public IEnumerable<T> GetSymbols(int cls) {
-                        Safe.ArgumentAssert(cls > 0, "cls");
+                        Safe.ArgumentAssert(!m_supportUnclassified || cls > 0, "cls");
                         return m_map.Where(p => p.Value == cls).Select(p => p.Key);
                     }
                     #endregion

Implab/Automaton/RegularExpressions/RegularDFA.cs +2 -1

                             dfa.SetStateTag(g.Key, g.SelectMany(x => x).ToArray());
                         // make the alphabet for the new DFA
-                        foreach (var pair in alphaMap)
+                        // skip all unclassified symbols
+                        foreach (var pair in alphaMap.Where(x => x.Value != 0))
                             alphabet.DefineClass(m_alphabet.GetSymbols(pair.Key), pair.Value);
                         return dfa;

Implab/Formats/JSON/JSONGrammar.cs +1 -1

                     }
                     Token SymbolRangeToken(char start, char stop) {
-                        return SymbolToken(Enumerable.Range(start,stop - start).Cast<char>());
+                        return SymbolToken(Enumerable.Range(start,stop - start).Select(x => (char)x));
                     }
                     protected override IndexedAlphabetBase<char> CreateAlphabet() {

Implab/Formats/TextScanner.cs +9 -3

                             while (pos < m_bufferSize) {
                                 var ch = m_buffer[pos];
-                                state = dfa[state, ch > maxSymbol ? AutomatonConst.UNCLASSIFIED_INPUT : alphabet[ch]];
+                                try {
-                                if (state == AutomatonConst.UNREACHABLE_STATE)
+                                var next = dfa[state, ch > maxSymbol ? AutomatonConst.UNCLASSIFIED_INPUT : alphabet[ch]];
+                                if (next == AutomatonConst.UNREACHABLE_STATE)
                                     break;
+                                state = next;
+                                }catch {
+                                    throw;
+                                }
                                 pos++;
                             }

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages