Changeset 519eaf5 for src/dgp/sgraph.cc

Timestamp:

03/30/14 23:59:06 (11 years ago)

Author:

Tomasz Obrebski <obrebski@…>

Branches:

master

Children:

0a58b3f

Parents:

f924e4b

git-author:

Tomasz Obrebski <obrebski@…> (03/30/14 23:59:06)

git-committer:

Tomasz Obrebski <obrebski@…> (03/30/14 23:59:06)

Message:

Bug fixes: bubbles,props

File:

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

src/dgp/sgraph.cc

@@ -29 +29 @@
 
   newnode.edge.push_back(lastnodeind());
+
+  newnode.edge_contains_self = true ;
 
   return lastnodeind();
@@ -85 +87 @@
 //----------------------------------------------------------------------------------------------------
 
-void SGraph::print_arc(FILE* f, int head, int dep, Role role, int dir) // 0 - left, 1 - right
+void SGraph::print_arc(FILE* f, const char* msg, int head, int dep, Role role, int dir) // 0 - left, 1 - right
 {
   if(dir==0)
-    fprintf(f,"#A  %s:%d <-- %d\n", role.str(), dep, head);
+    fprintf(f,"%s  %s:%d <-- %d\n", msg, role.str(), dep, head);
   else
-    fprintf(f,"#A  %s:%d --> %d\n", role.str(), head, dep);
+    fprintf(f,"%s  %s:%d --> %d\n", msg, role.str(), head, dep);
 }
 
@@ -113 +115 @@
     for(vector<Arc>::iterator h=node.heads.begin(); h!=node.heads.end(); ++h)
     {
-      // if(cont) buf+=sprintf(buf,","); else cont=true;
       buf+=sprintf(buf,"(++%s:%d)",h->role.str(),h->dst);
-      // buf+=sprintf(buf,"++%s-%d(%d~%d)",h->role.str(),h->dst,h->headanc,h->depanc);
-      // buf+=sprintf(buf,"(<-%s-%d)",h->role.str(),h->dst);
     }
 
@@ -122 +121 @@
     for(vector<Arc>::iterator d=node.deps.begin(); d!=node.deps.end(); ++d)
     {
-      //      if(! nodes[d->dst].saturated()) continue; // NIE DRUKUJ NIENASYCONYCH PODRZEDNIKOW
-      // if(cont) buf+=sprintf(buf,","); else cont=true;
       buf+=sprintf(buf,"(--%s:%d)",d->role.str(),d->dst);
-      // buf+=sprintf(buf,"--%s-%d(%d~%d)",d->role.str(),d->dst,d->headanc,d->depanc);
-      // buf+=sprintf(buf,"(-%s->%d)",d->role.str(),d->dst);
     }
   
@@ -177 +172 @@
 {
   char *buf0 = buf;
-  buf+=sprintf(buf,"#%s",pref);
-
-  buf+=sprintf(buf,"%-16s",form(n));
-
+  buf+=sprintf(buf,"%-10s",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+=sprintf(buf,"/");
-  for(vector<int>::iterator e = nodes[n].edge.begin(); e != nodes[n].edge.end(); e++ )
-    buf += sprintf(buf,"%d ", *e);
+  // buf+=sprintf(buf,"/");
+  // for(vector<int>::iterator e = nodes[n].edge.begin(); e != nodes[n].edge.end(); e++ )
+  //   buf += sprintf(buf,"%d ", *e);
 
   buf+=sprintf(buf,"\n");