boolean can only take true or false as a value, don't fear

diff --git a/src/surf/surf_routing_dijkstra.cpp b/src/surf/surf_routing_dijkstra.cpp
index d1e3350..88cc782 100644 (file)
--- a/src/surf/surf_routing_dijkstra.cpp
+++ b/src/surf/surf_routing_dijkstra.cpp
@@ -381,13 +381,11 @@ void AsDijkstra::parseRoute(sg_platf_route_cbarg_t route)
   const char *src = route->src;
   const char *dst = route->dst;
 
   const char *src = route->src;
   const char *dst = route->dst;
 

-  int as_route = 0;

   if(!route->gw_dst && !route->gw_src)
     XBT_DEBUG("Load Route from \"%s\" to \"%s\"", src, dst);
   else{
     XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src,
         route->gw_src->name(), dst, route->gw_dst->name());
   if(!route->gw_dst && !route->gw_src)
     XBT_DEBUG("Load Route from \"%s\" to \"%s\"", src, dst);
   else{
     XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src,
         route->gw_src->name(), dst, route->gw_dst->name());

-    as_route = 1;

     if(route->gw_dst->getRcType() == SURF_NETWORK_ELEMENT_NULL)
       surf_parse_error("The gw_dst '%s' does not exist!",route->gw_dst->name());
     if(route->gw_src->getRcType() == SURF_NETWORK_ELEMENT_NULL)
     if(route->gw_dst->getRcType() == SURF_NETWORK_ELEMENT_NULL)
       surf_parse_error("The gw_dst '%s' does not exist!",route->gw_dst->name());
     if(route->gw_src->getRcType() == SURF_NETWORK_ELEMENT_NULL)


@@ -410,7 +408,7 @@ void AsDijkstra::parseRoute(sg_platf_route_cbarg_t route)
   newRoute(src_net_elm->id(), dst_net_elm->id(), e_route);
 
   // Symmetrical YES
   newRoute(src_net_elm->id(), dst_net_elm->id(), e_route);
 
   // Symmetrical YES

-  if ( (route->symmetrical == TRUE && as_route == 0) || (route->symmetrical == TRUE && as_route == 1) ) {
+  if (route->symmetrical == TRUE) {

     if(!route->gw_dst && !route->gw_src)
       XBT_DEBUG("Load Route from \"%s\" to \"%s\"", dst, src);
     else
     if(!route->gw_dst && !route->gw_src)
       XBT_DEBUG("Load Route from \"%s\" to \"%s\"", dst, src);
     else

diff --git a/src/surf/surf_routing_floyd.cpp b/src/surf/surf_routing_floyd.cpp
index 4036f0b..b1b6909 100644 (file)
--- a/src/surf/surf_routing_floyd.cpp
+++ b/src/surf/surf_routing_floyd.cpp
@@ -137,8 +137,6 @@ void AsFloyd::parseRoute(sg_platf_route_cbarg_t route)
   const char *src = route->src;
   const char *dst = route->dst;
 
   const char *src = route->src;
   const char *dst = route->dst;
 

-  int as_route = 0;
-

   /* set the size of table routing */
   int table_size = (int)xbt_dynar_length(vertices_);
 
   /* set the size of table routing */
   int table_size = (int)xbt_dynar_length(vertices_);
 


@@ -167,7 +165,6 @@ void AsFloyd::parseRoute(sg_platf_route_cbarg_t route)
   if(!route->gw_dst && !route->gw_src)
     XBT_DEBUG("Load Route from \"%s\" to \"%s\"", src, dst);
   else{
   if(!route->gw_dst && !route->gw_src)
     XBT_DEBUG("Load Route from \"%s\" to \"%s\"", src, dst);
   else{

-    as_route = 1;

     XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src,
         route->gw_src->name(), dst, route->gw_dst->name());
     if(route->gw_dst->getRcType() == SURF_NETWORK_ELEMENT_NULL)
     XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src,
         route->gw_src->name(), dst, route->gw_dst->name());
     if(route->gw_dst->getRcType() == SURF_NETWORK_ELEMENT_NULL)


@@ -203,10 +200,7 @@ void AsFloyd::parseRoute(sg_platf_route_cbarg_t route)
         ((TO_FLOYD_LINK(src_net_elm->id(), dst_net_elm->id()))->link_list)->used;   /* count of links, old model assume 1 */
   }
 
         ((TO_FLOYD_LINK(src_net_elm->id(), dst_net_elm->id()))->link_list)->used;   /* count of links, old model assume 1 */
   }
 

-  if ( (route->symmetrical == TRUE && as_route == 0)
-      || (route->symmetrical == TRUE && as_route == 1)
-  )
-  {
+  if (route->symmetrical == TRUE) {

     if(TO_FLOYD_LINK(dst_net_elm->id(), src_net_elm->id()))
     {
       if(!route->gw_dst && !route->gw_src)
     if(TO_FLOYD_LINK(dst_net_elm->id(), src_net_elm->id()))
     {
       if(!route->gw_dst && !route->gw_src)


@@ -228,14 +222,12 @@ void AsFloyd::parseRoute(sg_platf_route_cbarg_t route)
           (int_f_cpvoid_cpvoid_t) floyd_pointer_resource_cmp),
           "The route between \"%s\" and \"%s\" already exists", src,dst);
     }
           (int_f_cpvoid_cpvoid_t) floyd_pointer_resource_cmp),
           "The route between \"%s\" and \"%s\" already exists", src,dst);
     }

-    else
-    {
-      if(route->gw_dst && route->gw_src)
-      {
-        sg_netcard_t gw_src = route->gw_src;
-        sg_netcard_t gw_dst = route->gw_dst;
-        route->gw_src = gw_dst;
-        route->gw_dst = gw_src;
+    else {
+
+      if(route->gw_dst && route->gw_src) {
+        NetCard* gw_tmp = route->gw_src;
+        route->gw_src = route->gw_dst;
+        route->gw_dst = gw_tmp;

       }
 
       if(!route->gw_src && !route->gw_dst)
       }
 
       if(!route->gw_src && !route->gw_dst)

diff --git a/src/surf/surf_routing_full.cpp b/src/surf/surf_routing_full.cpp
index 84367d6..1ec4308 100644 (file)
--- a/src/surf/surf_routing_full.cpp
+++ b/src/surf/surf_routing_full.cpp
@@ -132,8 +132,6 @@ static int full_pointer_resource_cmp(const void *a, const void *b)
 
 void AsFull::parseRoute(sg_platf_route_cbarg_t route)
 {
 
 void AsFull::parseRoute(sg_platf_route_cbarg_t route)
 {

-  int as_route = 0;
-

   const char *src = route->src;
   const char *dst = route->dst;
   NetCard *src_net_elm = sg_netcard_by_name_or_null(src);
   const char *src = route->src;
   const char *dst = route->dst;
   NetCard *src_net_elm = sg_netcard_by_name_or_null(src);


@@ -202,7 +200,6 @@ void AsFull::parseRoute(sg_platf_route_cbarg_t route)
       //                         "in a sub-sub-AS is not allowed), "
       //                         "but '%s' is not in '%s'.",
       //                         route->dst_gateway, subas->name);
       //                         "in a sub-sub-AS is not allowed), "
       //                         "but '%s' is not in '%s'.",
       //                         route->dst_gateway, subas->name);

-      as_route = 1;

       XBT_DEBUG("Load ASroute from \"%s\" to \"%s\"", src, dst);
       if (!route->gw_src ||
           route->gw_src->getRcType() == SURF_NETWORK_ELEMENT_NULL)
       XBT_DEBUG("Load ASroute from \"%s\" to \"%s\"", src, dst);
       if (!route->gw_src ||
           route->gw_src->getRcType() == SURF_NETWORK_ELEMENT_NULL)


@@ -219,12 +216,9 @@ void AsFull::parseRoute(sg_platf_route_cbarg_t route)
     xbt_dynar_shrink(TO_ROUTE_FULL(src_net_elm->id(), dst_net_elm->id())->link_list, 0);
   }
 
     xbt_dynar_shrink(TO_ROUTE_FULL(src_net_elm->id(), dst_net_elm->id())->link_list, 0);
   }
 

-  if ( (route->symmetrical == TRUE && as_route == 0)
-      || (route->symmetrical == TRUE && as_route == 1)
-  ) {
+  if (route->symmetrical == TRUE) {

     if (route->gw_dst && route->gw_src) {
     if (route->gw_dst && route->gw_src) {

-      sg_netcard_t gw_tmp;
-      gw_tmp = route->gw_src;
+      NetCard* gw_tmp = route->gw_src;

       route->gw_src = route->gw_dst;
       route->gw_dst = gw_tmp;
     }
       route->gw_src = route->gw_dst;
       route->gw_dst = gw_tmp;
     }