Changeset 854bece for src/dgp/dgp1.cc

Timestamp:

01/12/15 19:07:44 (10 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

File:

• src/dgp/dgp1.cc (modified) (3 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); }