Changeset a15e59b for src

Timestamp:

03/13/12 17:07:34 (12 years ago)

Author:

Tomasz Obrebski <to@…>

Branches:

master

Children:

f4bf33e

Parents:

abd28d1

git-author:

Tomasz Obrebski <to@…> (03/13/12 17:07:34)

git-committer:

Tomasz Obrebski <to@…> (03/13/12 17:07:34)

Message:

dodana opcja --time w dgp, poprawione przesy�anie b�belk�w, obsluga &LEFT, &RIGHT

Location:

src/dgp

Files:

• cmdline_dgp.ggo (modified) (1 diff)
• dgp1.cc (modified) (1 diff)
• grammar.cc (modified) (1 diff)
• grammar.hh (modified) (2 diffs)
• main.cc (modified) (7 diffs)
• sgraph.cc (modified) (1 diff)

src/dgp/cmdline_dgp.ggo

@@ -11 +11 @@
                                 flag off
 
+option  "time"          -       "Print parse time."
+                                flag off
+
 option  "info"          -       "Print info. 
-h - heads         d - dependents
-s - sets
-c - constraints   n - node/arc counts   t - parse time
-"
+                                       h - heads         d - dependents
+                                       s - sets
+                                       c - constraints    n - node/arc counts"
 string no default="h"

src/dgp/dgp1.cc

@@ -303 +303 @@
 //====================================================================================================
 
-bool check_boubbles_at_target(list<Boubble*> boubbles, int node)
-{
-  for(list<Boubble*>::iterator b = boubbles.begin(); b != boubbles.end(); b++)
-    if( (*b)->is_at_target() && !grammar.check_longrel(sgraph.cat((*b)->src()), sgraph.cat(node), (*b)->rel()))
-      return false;
+// sprawdza czy te, spo¶ród b±bli, które dotar³y do celu node
+// daj± wynik prawdziwy, dodatkowo - usuwa je z listy boubbles
+
+bool check_boubbles_at_target(list<Boubble*>& boubbles, int node)
+{
+  list<Boubble*>::iterator last; // ostatnio sprawdzany b±bel
+  bool remove=false;             // czy usun±æ ostatnio sprawdzany b±bel
+
+  for(list<Boubble*>::iterator b = boubbles.begin(); b != boubbles.end(); b = remove ? boubbles.erase(b) : ++b )
+    if( (*b)->is_at_target() )
+      if( grammar.check_longrel(sgraph.cat((*b)->src()), sgraph.cat(node), (*b)->rel()) )
+        remove=true;
+      else
+        return false;
+    else
+      remove=false;
+      
   return true;
 }
+
+// bool check_boubbles_at_target(list<Boubble*> boubbles, int node)
+// {
+//   for(list<Boubble*>::iterator b = boubbles.begin(); b != boubbles.end(); ++b )
+//     if( (*b)->is_at_target() && !grammar.check_longrel(sgraph.cat((*b)->src()), sgraph.cat(node), (*b)->rel()) )
+//       return false;
+//   return true;
+// }
 
 //====================================================================================================

src/dgp/grammar.cc

@@ -187 +187 @@
   Prop::add("INIT");
   Prop::add("FIN");
+  Prop::add("LEFT");
+  Prop::add("RIGHT");
 
   //<<< TU?

src/dgp/grammar.hh

@@ -192 +192 @@
 //----------------------------------------------------------------------------------------------------
 
-inline
-bool Grammar::check_constr(NodeProp& hprop, NodeProp& dprop, int dir, Role role)    // dir: 0-left 1-right
-{
-  return 
-    !hprop.forbidden[role] &&
-    ( dir==1 || !right[role] ) &&
-    ( dir==0 || !left[role]  ) &&
-    ( dir==1 || (hprop.attached&init).none() ) &&
-    ( dir==0 || (hprop.attached&fin).none() )
-    ;
-}
+// inline
+// bool Grammar::check_constr(NodeProp& hprop, NodeProp& dprop, int dir, Role role)    // dir: 0-left 1-right
+// {
+//   return 
+//     !hprop.forbidden[role] &&
+//     ( dir==1 || !right[role] ) &&
+//     ( dir==0 || !left[role]  ) &&
+//     ( dir==1 || (hprop.attached&init).none() ) &&
+//     ( dir==0 || (hprop.attached&fin).none() )
+//     ;
+// }
 
 //----------------------------------------------------------------------------------------------------
@@ -211 +211 @@
   return 
     !hprop.forbidden[link.role] &&
-    ( dir==1 || !right[link.role] ) &&
-    ( dir==0 || !left[link.role]  ) &&
+    ( dir==1 || (!right[link.role] && !link.props[Prop("RIGHT")]) ) &&  // ZREZYGNOWAÆ Z TABLICY right[<role>]
+    ( dir==0 || (!left[link.role] && !link.props[Prop("LEFT")]) ) &&
     ( dir!=0 || !hprop.init_attached ) &&
     ( dir!=1 || !hprop.fin_attached )

src/dgp/main.cc

@@ -6 +6 @@
  * Author:      Tomasz Obrebski
  */
+
+#include <ctime>
+#include <sys/time.h>
 
 #include "global.hh"
@@ -16 +19 @@
 
 #define MAXSEGMENTS 500
+
+#define MICROSECONDSELAPSED(A,B) ((B.tv_sec - A.tv_sec)*1000000 + (B.tv_usec - A.tv_usec))
 
 char segment[MAXSEGMENTS][MAXLINE];
@@ -30 +35 @@
 FILE* debugf=stdout;
 unsigned int info=0U;
+
+bool printtimeinfo=false;
 
 void output();
@@ -53 +60 @@
   if(args.debug_given) debug=true;
 
+  if(args.time_given) printtimeinfo=true;
+
   for(char* c=args.info_arg; *c!='\0' ; ++c)
     switch(*c)
@@ -70 +79 @@
   // exit(0);
 
-
+  struct timeval starttime,afterinput,afterparse,endtime;
 
   mgraph.clear();
@@ -78 +87 @@
   while (fgets(line, MAXLINE+1, inputf))
   {
+    gettimeofday(&starttime,NULL);
     line[strlen(line)-1] = '\0';
     strcpy(segment[segcount],line);
@@ -90 +100 @@
     if(strcmp(segtype,"EOS")==0)
     {
+      gettimeofday(&afterinput,NULL);
       dgp1(); // parametry!!! MGraph, SGraph, Grammar
+      gettimeofday(&afterparse,NULL);
       output();
+      gettimeofday(&endtime,NULL);
+
+      if(printtimeinfo)
+        {
+          fprintf(stderr,"### INPUT  TIME: %10.2fms\n", (float)MICROSECONDSELAPSED(starttime,afterinput)/1000 );
+          fprintf(stderr,"### PARSE  TIME: %10.2fms\n", (float)MICROSECONDSELAPSED(afterinput,afterparse)/1000 );
+          fprintf(stderr,"### OUTPUT TIME: %10.2fms\n", (float)MICROSECONDSELAPSED(afterparse,endtime)/1000 );
+          fprintf(stderr,"### TOTAL  TIME: %10.2fms\n", (float)MICROSECONDSELAPSED(starttime,endtime)/1000 );
+        }
       
       mgraph.clear();

src/dgp/sgraph.cc

@@ -148 +148 @@
       if(node.prop.forbidden[i]) buf+=sprintf(buf,"%s!%s",(cont++)?",":"",i.str());
     for(Role i=1; i<=Role::count(); ++i)
-      if(node.prop.required[i]) buf+=sprintf(buf,"%s&%s",(cont++)?",":"",i.str());
+      if(node.prop.required[i]) buf+=sprintf(buf,"%s-%s",(cont++)?",":"",i.str());
     for(Role i=1; i<=Role::count(); ++i)
       if(node.prop.attached[i]) buf+=sprintf(buf,"%s+%s",(cont++)?",":"",i.str());