Changeset acbabee for src/dgp/sgraph.cc

Timestamp:

12/17/14 12:13:11 (10 years ago)

Author:

Tomasz Obrebski <obrebski@…>

Branches:

master

Children:

854bece

Parents:

d484a32

git-author:

Tomasz Obrebski <obrebski@…> (12/17/14 12:10:45)

git-committer:

Tomasz Obrebski <obrebski@…> (12/17/14 12:13:11)

Message:

many changes, mainly dgp1 algorithm

File:

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

src/dgp/sgraph.cc

@@ -1 @@
-#include "global.hh"
 #include "sgraph.hh"
 #include "grammar.hh"
@@ -16 +15 @@
   newnode.mnode=mnodeind;
 
-  for(vector<int>::iterator pm=mgraph[newnode.mnode].pred.begin(); pm!=mgraph[newnode.mnode].pred.end(); ++pm)
-    for(vector<int>::iterator ps=mgraph[*pm].snodes.begin(); ps!=mgraph[*pm].snodes.end(); ++ps)
-      if(nodes[*ps].in_LH)
-      {
-        newnode.LV.set(*ps);
-        if(nodes[*ps].saturated()) newnode.LV |= nodes[*ps].LH;
-      }
+  // for(vector<int>::iterator pm=mgraph[newnode.mnode].pred.begin(); pm!=mgraph[newnode.mnode].pred.end(); ++pm)
+  //   for(vector<int>::iterator ps=mgraph[*pm].snodes.begin(); ps!=mgraph[*pm].snodes.end(); ++ps)
+  //     if(nodes[*ps].in_LH)
+  //     {
+  //       newnode.LV.set(*ps);
+  //       if(nodes[*ps].saturated()) newnode.LV |= nodes[*ps].LH;
+  //     }
 
   mgraph[newnode.mnode].snodes.push_back(lastnodeind());
 
-  newnode.in_LH=true;
+  // newnode.in_LH=true;
 
-  newnode.edge.push_back(lastnodeind());
+  // newnode.edge.push_back(lastnodeind());
 
-  newnode.edge_contains_self = true ;
+  newnode.edge.insert_self();
 
   return lastnodeind();
@@ -55 +54 @@
 //====================================================================================================
 
-int SGraph::clone(int ancind, NodeProp newprop)
+int SGraph::clone(int ancind, NodeProp newprop, Edge edge)
 {
   SNode &newnode=makenewnode();
   SNode &ancnode = nodes[ancind];
 
-  newnode.prop=newprop;
-  newnode.mnode=ancnode.mnode;
+  newnode.prop = newprop;
+  newnode.edge = edge;
+  newnode.mnode = ancnode.mnode;
   mgraph[newnode.mnode].snodes.push_back(lastnodeind());
 
@@ -90 +90 @@
 {
   if(dir==0)
-    fprintf(f,"%s  %s:%d <-- %d\n", msg, role.str(), dep, head);
+    fprintf(f,"%s\t%d <-- %d\t%s\n", msg, dep, head, role.str());
   else
-    fprintf(f,"%s  %s:%d --> %d\n", msg, role.str(), head, dep);
+    fprintf(f,"%s\t%d --> %d\t%s\n", msg, head, dep, role.str());
 }
 
@@ -172 +172 @@
 {
   char *buf0 = buf;
-  buf+=sprintf(buf,"%-10s",pref);
+  buf+=sprintf(buf,"%-8s",pref);
   buf+=sprintf(buf,"%d.%s",n,form(n));
   buf+=sprintf(buf,";");
   buf+=sprintf(buf,"%s ",cat(n).str());
   while(buf-buf0<40) buf+=sprintf(buf," ");
-  buf+=sprint_node(buf,n,anc,HEADS|DEPS|SETS|CONSTRAINTS);
+  buf+=sprint_node(buf,n,anc,HEADS|DEPS|CONSTRAINTS);
   
   buf+=sprintf(buf,"/");
-  for(vector<int>::iterator e = nodes[n].edge.begin(); e != nodes[n].edge.end(); e++ )
+  if(nodes[n].edge.self())
+    buf += sprintf(buf,"* ");
+  for(list<int>::iterator e = nodes[n].edge.others().begin(); e != nodes[n].edge.others().end(); e++ )
     buf += sprintf(buf,"%d ", *e);