Changeset 854bece

Timestamp:

01/12/15 19:07:44 (9 years ago)

Author:

Tomasz Obrebski <obrebski@…>

Branches:

master

Children:

c03f8a5

Parents:

acbabee

git-author:

Tomasz Obrebski <obrebski@…> (01/12/15 19:07:44)

git-committer:

Tomasz Obrebski <obrebski@…> (01/12/15 19:07:44)

Message:

has_head prop added, visible_as_neighbour moved to prop

Location:

src/dgp

Files:

• dgp1.cc (modified) (3 diffs)
• sgraph.cc (modified) (1 diff)
• sgraph.hh (modified) (10 diffs)

src/dgp/dgp1.cc

@@ -173 +173 @@
   int newd = find_existing_node(sgraph[d].mnode, new_dep_prop, new_dep_edge);
   if( newd < 0  )
-    newd = create_new_node(d,new_dep_prop,new_dep_edge);
+    {
+      newd = create_new_node(d,new_dep_prop,new_dep_edge);
+      sgraph[newd].prop.has_head = true;
+    }
   
   Edge new_head_edge(sgraph[newd].edge,newd);
@@ -201 +204 @@
 
   Edge new_head_edge(sgraph[h].edge);
-  int newh = find_existing_node(sgraph[h].mnode, new_head_prop, new_head_edge);
+  int newh = -1;
+  if(!new_head_prop.forbidden[l.role]) newh = find_existing_node(sgraph[h].mnode, new_head_prop, new_head_edge);
   if( newh < 0 )
       {
         newh = create_new_node(h,new_head_prop,new_head_edge);
-        sgraph[newh].visible_as_neighbour = false;
+        sgraph[newh].prop.visible_as_neighbour = false;
       }
 
   Edge new_dep_edge;
-  int newd = find_existing_node(sgraph[d].mnode, new_dep_prop, new_dep_edge);
-  if( newd < 0)
-    newd = create_new_node(d,new_dep_prop,new_dep_edge);
+  int newd = d;
+  if( ! (new_dep_edge == sgraph[d].edge) || ! (old_dep_prop == new_dep_prop) )
+    {
+      newd = create_new_node(d,new_dep_prop,new_dep_edge);
+      sgraph[newd].prop.has_head = true;
+    }
 
 
@@ -299 +306 @@
   int i;
   while((i=lvi.next()) >= 0)
-      if(sgraph.saturated(i))
+    if(sgraph.saturated(i) && ! sgraph.has_head(i))
         {
           if(debug) {fprintf(stderr,"\t%d <-- %d",i,j); }

src/dgp/sgraph.cc

@@ -180 +180 @@
   
   buf+=sprintf(buf,"/");
+  buf+=sprintf(buf,nodes[n].prop.visible_as_neighbour ? "o" : "x");
   if(nodes[n].edge.self())
     buf += sprintf(buf,"* ");

src/dgp/sgraph.hh

@@ -55 +55 @@
   bool init_attached;
   bool fin_attached;
+  bool visible_as_neighbour;
+  bool has_head;
   
   FlagSet flags;
@@ -72 +74 @@
   if(init_attached != p.init_attached) return false;
   if(fin_attached != p.fin_attached) return false;
+  if(visible_as_neighbour != p.visible_as_neighbour) return false;
+  if(has_head != p.has_head) return false;
 
   list<Boubble*>::const_iterator b,b1;
@@ -106 +110 @@
 void NodeProp::copy(const NodeProp& p)
 {
-  required=p.required;
-  forbidden=p.forbidden;
-  attached=p.attached;
-  flags=p.flags;
-  init_attached=p.init_attached;
-  fin_attached=p.fin_attached;
+  required = p.required;
+  forbidden = p.forbidden;
+  attached = p.attached;
+  flags = p.flags;
+  init_attached = p.init_attached;
+  fin_attached = p.fin_attached;
+  visible_as_neighbour = p.visible_as_neighbour;
+  has_head = p.has_head;
   for(list<Boubble*>::const_iterator b = p.boubbles.begin(); b!=p.boubbles.end(); b++)
     boubbles.push_back(new Boubble(**b));
@@ -127 +133 @@
   init_attached=false;
   fin_attached=false;
+  visible_as_neighbour=true;
+  has_head=false;
   clear_boubbles();
 }
@@ -161 +169 @@
 struct SNode
 {
-  
-  SNode() { visible_as_neighbour = true; }
+  SNode() { prop.clear(); }
 
   int mnode;
 
   NodeProp prop;
-
   Edge edge;
-  bool visible_as_neighbour;
 
   bitset<MAXNODES> LV;
@@ -179 +184 @@
   vector<Arc> deps;
 
-  void clear();
-  bool saturated();
+  void clear() { prop.clear(), LV.reset(), LD.reset(), LH.reset(), heads.clear(), deps.clear(); }
+  bool saturated() { return prop.required.none(); }
+  
 
   // void edge_clear()               { edge.clear(); edge_contains_self=false;}
@@ -191 +197 @@
 };
 
-//----------------------------------------------------------------------------------------------------
-inline
-void SNode::clear()
-{ prop.clear(), LV.reset(), LD.reset(), LH.reset(), heads.clear(), deps.clear(); }
-//----------------------------------------------------------------------------------------------------
-inline
-bool SNode::saturated()
-{ return prop.required.none(); }
-
 //====================================================================================================
 // SGraph CLASS
@@ -219 +216 @@
   void update_left(int headind, int depind);
   void update_right(int headind, int depind);
-  bool visible(int left, int right);
-  bool saturated(int node);
+  bool visible(int left, int right) { return nodes[right].LV[left]; }
+  bool saturated(int node) { return nodes[node].saturated(); }
+  bool has_head(int node) { return nodes[node].prop.has_head; }
 
   Cat  cat(int i) const { return mgraph[nodes[i].mnode].cat; }    
@@ -251 +249 @@
   int sprint_node_debug(char* buf, const char* pref, int n, int anc);
 };
-
-//----------------------------------------------------------------------------------------------------
-
-inline bool SGraph::visible(int left, int right)
-{
-  return nodes[right].LV[left];
-}
-
-//----------------------------------------------------------------------------------------------------
-
-inline bool SGraph::saturated(int node)
-{
-  return nodes[node].saturated();
-}
 
 //----------------------------------------------------------------------------------------------------
@@ -413 +397 @@
       vector<int>& spredecessors = mgraph[*mp].snodes;
       for(vector<int>::iterator sp = spredecessors.begin(); sp != spredecessors.end(); ++sp )
-        if(sgraph[*sp].visible_as_neighbour || !strict)
+        if(sgraph[*sp].prop.visible_as_neighbour || !strict)
           {
             push(wayup,*sp);