Changeset e7de6cc for src/dgp/mgraph.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/mgraph.cc (modified) (4 diffs)

src/dgp/mgraph.cc

@@ -4 +4 @@
 #include "const.hh"
 
-#include <stdio.h>
+#include <cstdio>
 
 int MGraph::add_node(char* seg)
 {
-  nodes[n].clear();
+  MNode newnode;
+  newnode.clear();
   
-  char field1[80], field3[80], descr[256], gph[256];
+  char field1[80], field3[80], field4[256], descr[256], gph[256];
   char* cat;
   
   getfield(seg,"1",field1);
-  nodes[n].pos=atoi(field1);
+  newnode.pos=atoi(field1);
 
   getfield(seg,"3",field3);
+
+  getfield(seg,"4",field4);
+  strcpy(newnode.form,field4);
+
   if(!getfield(seg,"lem",descr)) strcpy(descr,"?,?");
 
@@ -23 +28 @@
   if(*cat) ++cat;
   
-//  Cat::add(cat);
   if(Cat::index(cat)>0)
-    nodes[n].cat=cat;
+    newnode.cat=cat;
   else
-    nodes[n].cat="NULL";
+    newnode.cat="NULL";
   
-  nodes[n].pred.clear();
+  newnode.pred.clear();
   
   char* tok;
@@ -41 +45 @@
 
   char* ids=strtok(gph,":");
-  if(n!=atoi(ids)){fprintf(stderr,"Invalid node id in line ?. Program aborted.\n"); exit(1); }
+  if(size() != atoi(ids)) {fprintf(stderr,"Invalid node id in line ?. Program aborted.\n"); exit(1); }
   
   char *preds;
@@ -47 +51 @@
   {
     previd=atoi(preds);
-    nodes[n].pred.push_back(&nodes[previd]);
+    newnode.pred.push_back(previd);
   }
 
-  return n++;
+  nodes.push_back(newnode);
+  return nodes.size()-1;
 }