X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/66f9d7f18e9a5f08bbcc381381283895ab6a0a89..4ea540ea3e645b1a0b2c4ffd46643cd2695396f2:/src/surf/surf_routing_full.c diff --git a/src/surf/surf_routing_full.c b/src/surf/surf_routing_full.c index 1544595c5f..89e305fd91 100644 --- a/src/surf/surf_routing_full.c +++ b/src/surf/surf_routing_full.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2009, 2010, 2011. The SimGrid Team. +/* Copyright (c) 2009-2013. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -115,6 +115,8 @@ AS_t model_full_create(void) new_component->generic_routing.parse_ASroute = model_full_set_route; new_component->generic_routing.get_route_and_latency = full_get_route_and_latency; + new_component->generic_routing.get_graph = generic_get_graph; + new_component->generic_routing.get_onelink_routes = full_get_onelink_routes; new_component->generic_routing.finalize = full_finalize; @@ -242,8 +244,8 @@ void model_full_set_route(AS_t rc, sg_platf_route_cbarg_t route) xbt_dynar_shrink(TO_ROUTE_FULL(src_net_elm->id, dst_net_elm->id)->link_list, 0); } - if ( (A_surfxml_route_symmetrical == A_surfxml_route_symmetrical_YES && as_route == 0) - || (A_surfxml_ASroute_symmetrical == A_surfxml_ASroute_symmetrical_YES && as_route == 1) + if ( (route->symmetrical == TRUE && as_route == 0) + || (route->symmetrical == TRUE && as_route == 1) ) { if (route->gw_dst && route->gw_src) { sg_routing_edge_t gw_tmp;