fixes issues #768, #794, #812

2013-12-11 15:36:32 -05:00 · 2013-12-11 15:36:32 -05:00 · d5eee3138f
commit d5eee3138f
parent fdfe0ce63d
1 changed files with 10 additions and 7 deletions
--- a/Contractor/EdgeBasedGraphFactory.cpp
+++ b/Contractor/EdgeBasedGraphFactory.cpp
@ -349,13 +349,16 @@ void EdgeBasedGraphFactory::Run(
                    continue;
                }

-                if( is_barrier_node && (u != w) ) {
-                    ++skipped_turns_counter;
-                    continue;
-                }
-
-                if( (u == w) && (1 != m_node_based_graph->GetOutDegree(v)) ) {
-                    continue;
+                if( is_barrier_node) {
+                    if(u != w) {
+                        ++skipped_turns_counter;
+                        continue;
+                    }
+                } else {
+                    if ( (u == w) && (m_node_based_graph->GetOutDegree(v) > 1) ) {
+                        ++skipped_turns_counter;
+                        continue;
+                    }
                }

                //only add an edge if turn is not a U-turn except when it is