@@ -359,7 +359,7 @@ void GraphState::print ( GSWalk* gsw, map<Tid, int> weightmap_a, map<Tid, int> w // convert occurrence lists to weight maps with initial weight 1 for ( int i = 0; i < (int) nodes.size (); i++ ) { set<InputNodeLabel> inl; inl.insert(fm::database->nodelabels[nodes[i].label].inputlabel); - gsw->nodewalk.push_back( (GSWNode) { inl, weightmap_a, weightmap_i, 0 } ); + gsw->nodewalk.push_back( (GSWNode) { inl, weightmap_a, weightmap_i, 0, 0 } ); } for ( int i = 0; i < (int) nodes.size (); i++ ) { @@ -367,7 +367,7 @@ void GraphState::print ( GSWalk* gsw, map<Tid, int> weightmap_a, map<Tid, int> w GraphState::GSEdge &edge = nodes[i].edges[j]; if ( i < edge.tonode ) { set<InputEdgeLabel> iel; iel.insert((InputEdgeLabel) fm::database->edgelabels[fm::database->edgelabelsindexes[edge.edgelabel]].inputedgelabel); - gsw->edgewalk[i][edge.tonode] = (GSWEdge) { edge.tonode , iel, weightmap_a, weightmap_i, 0 } ; + gsw->edgewalk[i][edge.tonode] = (GSWEdge) { edge.tonode , iel, weightmap_a, weightmap_i, 0, 0 } ; } } } @@ -1406,8 +1406,8 @@ int GSWalk::conflict_resolution (vector<int> core_ids, GSWalk* s, bool direction map<Tid, int> weightmap_i; set<InputNodeLabel> inl; set<InputEdgeLabel> iel; - GSWNode n = { inl, weightmap_a, weightmap_i }; - GSWEdge e = { to->first, iel, weightmap_a, weightmap_i }; + GSWNode n = { inl, weightmap_a, weightmap_i, 0, 0 }; + GSWEdge e = { to->first, iel, weightmap_a, weightmap_i, 0, 0 }; s->add_edge(from->first, e, n, 0, &core_ids, &u12); } } @@ -1518,8 +1518,8 @@ int GSWalk::conflict_resolution (vector<int> core_ids, GSWalk* s, bool direction map<Tid, int> weightmap_i; set<InputNodeLabel> inl; set<InputEdgeLabel> iel; - GSWNode n = { inl, weightmap_a, weightmap_i }; - GSWEdge e = { *it, iel, weightmap_a, weightmap_i }; + GSWNode n = { inl, weightmap_a, weightmap_i, 0, 0 }; + GSWEdge e = { *it, iel, weightmap_a, weightmap_i, 0, 0 }; ninsert21[*it][j]=n; einsert21[*it][j]=e; } @@ -1554,8 +1554,8 @@ int GSWalk::conflict_resolution (vector<int> core_ids, GSWalk* s, bool direction map<Tid, int> weightmap_i; set<InputNodeLabel> inl; set<InputEdgeLabel> iel; - GSWNode n = { inl, weightmap_a, weightmap_i }; - GSWEdge e = { *it, iel, weightmap_a, weightmap_i }; + GSWNode n = { inl, weightmap_a, weightmap_i, 0, 1 }; + GSWEdge e = { *it, iel, weightmap_a, weightmap_i, 0, 1 }; ninsert12[*it][j]=n; einsert12[*it][j]=e; } graphstate.cpp @@ -134,6 +134,8 @@ struct GSWNode { map<Tid, int> a; map<Tid, int> i; bool deleted; + bool optional; + int stack(GSWNode n); friend ostream& operator<< (ostream &out, GSWNode* n); }; @@ -148,6 +150,8 @@ struct GSWEdge { map<Tid, int> a; map<Tid, int> i; bool deleted; + bool optional; + int stack(GSWEdge e); static bool lt_to (GSWEdge& e1, GSWEdge& e2){ if (e1.to < e2.to) return 1; graphstate.h @@ -1112,7 +1112,10 @@ ostream& operator<< (ostream& os, GSWalk* gsw) { os << "}"; //#endif*/ - if (it2->second.deleted) os << " [D] "; + if (it2->second.deleted || it2->second.optional) os << " ["; + if (it2->second.optional) os << "O"; + if (it2->second.deleted) os << "D"; + if (it2->second.deleted || it2->second.optional) os << "] "; os << endl; } patterntree.cpp 1f92630e30e704253c87627815db170f3d10f8b9 Andreas Maunz andreas@maunz.de http://github.com/amaunz/last/commit/34180615813c0568b620d8c0aa11dda6cf791b67 34180615813c0568b620d8c0aa11dda6cf791b67 2009-11-06T04:51:03-08:00 2009-11-06T04:51:03-08:00 Added support for optional edges 6a1894519d1e8bef2d71344585db6658d2522d0e Andreas Maunz andreas@maunz.de