tiny tiny commit

diff --git a/.gitignore b/.gitignore
index 2007837..18ec1b3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -25,7 +25,7 @@ CTestResults.xml
 src/simdag/dax_dtd.l
 src/surf/xml/simgrid_dtd.l
 ### Jedule
 src/simdag/dax_dtd.l
 src/surf/xml/simgrid_dtd.l
 ### Jedule

-examples/simdag/scheduling/simgrid.jed
+examples/simdag/scheduling/sd_scheduling.jed

 teshsuite/simdag/platforms/simgrid.jed
 ### Libraries links 
 examples/lua/simgrid.so
 teshsuite/simdag/platforms/simgrid.jed
 ### Libraries links 
 examples/lua/simgrid.so


@@ -220,7 +220,6 @@ examples/simdag/goal/goal_test
 examples/simdag/io/sd_io
 examples/simdag/properties/sd_properties
 examples/simdag/scheduling/sd_scheduling
 examples/simdag/io/sd_io
 examples/simdag/properties/sd_properties
 examples/simdag/scheduling/sd_scheduling

-examples/simdag/scheduling/Montage_25.jed

 examples/simdag/availability/sd_availability
 examples/simdag/comm_throttling/sd_comm_throttling
 examples/simdag/fail/sd_fail
 examples/simdag/availability/sd_availability
 examples/simdag/comm_throttling/sd_comm_throttling
 examples/simdag/fail/sd_fail

diff --git a/src/simdag/sd_global.cpp b/src/simdag/sd_global.cpp
index 8ff96f8..fe5e779 100644 (file)
--- a/src/simdag/sd_global.cpp
+++ b/src/simdag/sd_global.cpp
@@ -119,7 +119,6 @@ void SD_create_environment(const char *platform_file)
 xbt_dynar_t SD_simulate(double how_long) {
   /* we stop the simulation when total_time >= how_long */
   double total_time = 0.0;
 xbt_dynar_t SD_simulate(double how_long) {
   /* we stop the simulation when total_time >= how_long */
   double total_time = 0.0;

-  double elapsed_time = 0.0;

   SD_task_t task, dst;
   SD_dependency_t dependency;
   surf_action_t action;
   SD_task_t task, dst;
   SD_dependency_t dependency;
   surf_action_t action;


@@ -139,7 +138,7 @@ xbt_dynar_t SD_simulate(double how_long) {
   }
 
   /* main loop */
   }
 
   /* main loop */

-  elapsed_time = 0.0;
+  double elapsed_time = 0.0;

   while (elapsed_time >= 0.0 && (how_long < 0.0 || 0.00001 < (how_long -total_time)) &&
          !sd_global->watch_point_reached) {
     surf_model_t model = NULL;
   while (elapsed_time >= 0.0 && (how_long < 0.0 || 0.00001 < (how_long -total_time)) &&
          !sd_global->watch_point_reached) {
     surf_model_t model = NULL;