Changeset b97a556 for src

Timestamp:

11/19/13 10:07:16 (11 years ago)

Author:

Tomasz Obrebski <obrebski@…>

Branches:

master

Children:

b30c30d

Parents:

e0cd003

git-author:

Tomasz Obrebski <to@…> (11/19/13 09:55:00)

git-committer:

Tomasz Obrebski <obrebski@…> (11/19/13 10:07:16)

Message:

drobiazgi w dgp

Location:

src

Files:

• dgp/dgp1.cc (modified) (5 diffs)
• dgp/sgraph.cc (modified) (2 diffs)
• tre/tre (modified) (3 diffs)

src/dgp/dgp1.cc

@@ -173 +173 @@
   
   if(debug) sgraph.print_node_debug(stderr,"C ",newheadind,h);
-  if(debug) print_sets(newheadind);
+  // if(debug) print_sets(newheadind);
   return newheadind;
 }
@@ -192 +192 @@
   
   if(debug) sgraph.print_node_debug(stderr,"C ",newind,d);
-  if(debug) print_sets(newind);
+  // if(debug) print_sets(newind);
   
   return newind;
@@ -212 +212 @@
 
   if(debug) sgraph.print_node_debug(stderr,"C ",newheadind,h);
-  if(debug) print_sets(newheadind);
+  // if(debug) print_sets(newheadind);
   
   return newheadind;
@@ -230 +230 @@
 
   if(debug) sgraph.print_node_debug(stderr,"C ",newind,d);
-  if(debug) print_sets(newind);
+  // if(debug) print_sets(newind);
   
   return newind;
@@ -304 +304 @@
   if(debug) sgraph.print_arc(stderr,newheadind,d,l.role,0);
   if(debug) sgraph.print_node_debug(stderr,"U ",newheadind,h);
-  if(debug) print_sets(newheadind);
+  // if(debug) print_sets(newheadind);
   if(debug) sgraph.print_node_debug(stderr,"U ",newdepind,d);
-  if(debug) print_sets(newdepind);
+  // if(debug) print_sets(newdepind);
 }
 

src/dgp/sgraph.cc

@@ -113 +113 @@
     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(%d~%d)",h->role.str(),h->dst,h->headanc,h->depanc);
+      // 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);
     }
 
@@ -121 +123 @@
     {
       //      if(! nodes[d->dst].saturated()) continue; // NIE DRUKUJ NIENASYCONYCH PODRZEDNIKOW
-      if(cont) buf+=sprintf(buf,","); else cont=true;
-      buf+=sprintf(buf,"--%s-%d(%d~%d)",d->role.str(),d->dst,d->headanc,d->depanc);
+      // 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);
     }
   

src/tre/tre

@@ -21 +21 @@
 $helptext=
 "The program generates trees from the graph output by dgp. dgp must\n"+
-"must be run with '-i ds' option.\n\n"+
+"must be run with '--info=ds' option.\n\n"+
 "Command:       tre [options]\n\n"+
 "Options:\n"+
@@ -269 +269 @@
 
     if parts[3]==nil || parts[4]==nil || parts[5]==nil
-      $stderr.print "ERR: tre requires dgp be called with '--info s' option. Aborting.\n"
+      $stderr.print "ERR: tre requires dgp be called with '--info=ds' option. Aborting.\n"
       exit
     end
@@ -280 +280 @@
     $arcs |= parts[2].split(',').map{ |a| case a 
                                           when /\-\-(\w+)-(\d+)\((\d+)~(\d+)\)/
-                                            [i, $2.to_i, $1, $3.to_i, $4.to_i]
+                                            # [i, $2.to_i, $1, $3.to_i, $4.to_i]
+                                            [i, $2.to_i, $1, 0, 0]
                                           when /\+\+(\w+)-(\d+)\((\d+)~(\d+)\)/
-                                            [$2.to_i, i, $1, $3.to_i, $4.to_i]
+                                            # [$2.to_i, i, $1, $3.to_i, $4.to_i]
+                                            [$2.to_i, i, $1, 0, 0]
                                           end }
     $succ |= parts[3][1..-2].split(',').map{|x| [x.to_i,i]}