Changeset e7de6cc for src/dgp/main.cc

Timestamp:

02/21/12 20:02:51 (13 years ago)

Author:

Tomasz Obrebski <to@…>

Branches:

master

Children:

b242df2

Parents:

354ba3d

git-author:

Tomasz Obrebski <to@…> (02/21/12 20:02:51)

git-committer:

Tomasz Obrebski <to@…> (02/21/12 20:02:51)

Message:

new version of dgp
added dgc, tre and compdic components
compiledic renamed to compdic_utf8
./configure updated

File:

• src/dgp/main.cc (modified) (5 diffs)

src/dgp/main.cc

@@ -11 +11 @@
 #include "sgraph.hh"
 #include "grammar.hh"
-#include "dgp0.hh"
+#include "dgp1.hh"
 #include "../common/common.h"
 #include "cmdline.h"
@@ -25 +25 @@
 Grammar grammar;
 MGraph mgraph;
-SGraph sgraph;
+SGraph sgraph(mgraph);
 
 FILE* grammarf;
@@ -65 +65 @@
   fclose(grammarf);
 
+
+
+  // grammar.write(cout);
+  // exit(0);
+
+
+
   mgraph.clear();
   sgraph.clear();
@@ -83 +90 @@
     if(strcmp(segtype,"EOS")==0)
     {
-      dgp0(); // parametry!!! MGraph, SGraph, Grammar
+      dgp1(); // parametry!!! MGraph, SGraph, Grammar
       output();
       
@@ -105 +112 @@
     if(seg_mnode[si]>=0)
     {
-      MNode& m=mgraph.nodes[seg_mnode[si]];
+      MNode& m=mgraph[seg_mnode[si]];
       for(vector<int>::iterator s=m.snodes.begin(); s!=m.snodes.end(); ++s)
       {