diff --git a/Expes/YorkUrbanDB/Scripts/ytimes.c b/Expes/YorkUrbanDB/Scripts/ytimes.c index cb01756ede28ea045847081ce3e0d82a32cf9e9c..da8cb9961de6e8735d37cc2013e08d54adbd35e7 100644 --- a/Expes/YorkUrbanDB/Scripts/ytimes.c +++ b/Expes/YorkUrbanDB/Scripts/ytimes.c @@ -5,7 +5,6 @@ #include <time.h> -#define EXPES_DIR "/home/even/Expes/" #define FBSD_DIR "Testers/TestLines/" #define YORK_DIR "YorkUrbanDB/" #define DATA_DIR "data/" @@ -69,8 +68,6 @@ int main (int argc, char *argv[]) fprintf (stderr, "Unable to create %s\n", SCRIPT_NAME); return (0); } - sprintf (val, "cd %s%s", EXPES_DIR, YORK_DIR); - fprintf (fcom, "%s\n", val); for (int i = nstart; i <= nend; i++) { tirage (tir); @@ -78,82 +75,80 @@ int main (int argc, char *argv[]) { if (tir[j] == 0) // lsd { - sprintf (val, "\\cp ImagesPGM/%s.pgm %s%stest.pgm", - ims[i], EXPES_DIR, LSD_DIR); + sprintf (val, "\\cp ../ImagesPGM/%s.pgm ../../%stest.pgm", + ims[i], LSD_DIR); fprintf (fcom, "%s\n", val); - sprintf (val, "cd %s%s", EXPES_DIR, LSD_DIR); + sprintf (val, "cd ../../%s", LSD_DIR); fprintf (fcom, "%s\n", val); sprintf (val, "\\rm lsdperf.txt"); fprintf (fcom, "%s\n", val); sprintf (val, "echo 'TIMING %d (%s) on lsd'", (i+1), ims[i]); fprintf (fcom, "%s\n", val); - sprintf (val, "lsd"); + sprintf (val, "./lsd"); fprintf (fcom, "%s\n", val); - sprintf (val, "cat lsdperf.txt >> %s%s%slsdtimes.txt", - EXPES_DIR, YORK_DIR, DATA_DIR); + sprintf (val, "cat lsdperf.txt >> ../../%s%slsdtimes.txt", + YORK_DIR, DATA_DIR); fprintf (fcom, "%s\n", val); - sprintf (val, "cd %s%s", EXPES_DIR, YORK_DIR); + sprintf (val, "cd ../../%s/%s", YORK_DIR, DATA_DIR); fprintf (fcom, "%s\n", val); } else if (tir[j] == 1) // ed { - sprintf (val, "\\cp Images/%s/%s.jpg %s%stest.jpg", - ims[i], ims[i], EXPES_DIR, ED_DIR); + sprintf (val, "\\cp ../Images/%s/%s.jpg ../../%stest.jpg", + ims[i], ims[i], ED_DIR); fprintf (fcom, "%s\n", val); - sprintf (val, "cd %s%s", EXPES_DIR, ED_DIR); + sprintf (val, "cd ../../%s", ED_DIR); fprintf (fcom, "%s\n", val); sprintf (val, "\\rm edperf.txt"); fprintf (fcom, "%s\n", val); sprintf (val, "echo 'TIMING %d (%s) on ed'", (i+1), ims[i]); fprintf (fcom, "%s\n", val); - sprintf (val, "EDLines"); + sprintf (val, "./EDLines"); fprintf (fcom, "%s\n", val); - sprintf (val, "cat edperf.txt >> %s%s%sedtimes.txt", - EXPES_DIR, YORK_DIR, DATA_DIR); + sprintf (val, "cat edperf.txt >> ../../%s%sedtimes.txt", + YORK_DIR, DATA_DIR); fprintf (fcom, "%s\n", val); - sprintf (val, "cd %s%s", EXPES_DIR, YORK_DIR); + sprintf (val, "cd ../../%s/%s", YORK_DIR, DATA_DIR); fprintf (fcom, "%s\n", val); } else if (tir[j] == 2) // canny { - sprintf (val, "\\cp Images/%s/%s.jpg %s%stest.jpg", - ims[i], ims[i], EXPES_DIR, CANNY_DIR); + sprintf (val, "\\cp ../Images/%s/%s.jpg ../../%stest.jpg", + ims[i], ims[i], CANNY_DIR); fprintf (fcom, "%s\n", val); - sprintf (val, "cd %s%s", EXPES_DIR, CANNY_DIR); + sprintf (val, "cd ../../%s", CANNY_DIR); fprintf (fcom, "%s\n", val); sprintf (val, "\\rm cannyperf.txt"); fprintf (fcom, "%s\n", val); sprintf (val, "echo 'TIMING %d (%s) on canny'", (i+1), ims[i]); fprintf (fcom, "%s\n", val); - sprintf (val, "CannyLine"); + sprintf (val, "./CannyLine"); fprintf (fcom, "%s\n", val); - sprintf (val, "cat cannyperf.txt >> %s%s%scannytimes.txt", - EXPES_DIR, YORK_DIR, DATA_DIR); + sprintf (val, "cat cannyperf.txt >> ../../%s%scannytimes.txt", + YORK_DIR, DATA_DIR); fprintf (fcom, "%s\n", val); - sprintf (val, "cd %s%s", EXPES_DIR, YORK_DIR); + sprintf (val, "cd ../../%s/%s", YORK_DIR, DATA_DIR); fprintf (fcom, "%s\n", val); } else if (tir[j] == 3) // fbsd { - sprintf (val, "\\cp Images/%s/%s.jpg %s%sData/image.jpg", - ims[i], ims[i], EXPES_DIR, FBSD_DIR); + sprintf (val, "\\cp ../Images/%s/%s.jpg ../../%sData/image.jpg", + ims[i], ims[i], FBSD_DIR); fprintf (fcom, "%s\n", val); - sprintf (val, "cd %s%s", EXPES_DIR, FBSD_DIR); + sprintf (val, "cd ../../%s", FBSD_DIR); fprintf (fcom, "%s\n", val); sprintf (val, "echo 'TIMING %d (%s) on fbsd'", (i+1), ims[i]); fprintf (fcom, "%s\n", val); sprintf (val, "./TestLines time"); fprintf (fcom, "%s\n", val); - sprintf (val, "cat Data/fbsdperf.txt >> %s%s%sfbsdtimes.txt", - EXPES_DIR, YORK_DIR, DATA_DIR); + sprintf (val, "cat Data/fbsdperf.txt >> ../../%s%sfbsdtimes.txt", + YORK_DIR, DATA_DIR); fprintf (fcom, "%s\n", val); - sprintf (val, "cd %s%s", EXPES_DIR, YORK_DIR); + sprintf (val, "cd ../../%s/%s", YORK_DIR, DATA_DIR); fprintf (fcom, "%s\n", val); } } } - sprintf (val, "cd %s", DATA_DIR); - fprintf (fcom, "%s\n", val); fclose (fcom); return (0); } diff --git a/Expes/YorkUrbanDB/data/moyennes/maltcov.c b/Expes/YorkUrbanDB/data/moyennes/maltcov.c index bd4540bd71f9cdaddcb4d01efca5fc3290de5f65..3c4261c19fceac9627e11423fafd8bb3d548941c 100755 --- a/Expes/YorkUrbanDB/data/moyennes/maltcov.c +++ b/Expes/YorkUrbanDB/data/moyennes/maltcov.c @@ -3,7 +3,6 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <malloc.h> #include <math.h> #define YORK_NB 102 diff --git a/Expes/YorkUrbanDB/data/moyennes/maltlines.c b/Expes/YorkUrbanDB/data/moyennes/maltlines.c index 2d7cc8bab97477658e7bbde37db6cb7331275da3..8d12173e65e8ff5c5c78e248083cb7f155ba7f70 100755 --- a/Expes/YorkUrbanDB/data/moyennes/maltlines.c +++ b/Expes/YorkUrbanDB/data/moyennes/maltlines.c @@ -3,7 +3,6 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <malloc.h> #include <math.h> #define YORK_NB 102 diff --git a/Expes/YorkUrbanDB/data/moyennes/maltth.c b/Expes/YorkUrbanDB/data/moyennes/maltth.c index 5854c76d3149157cb639b31638f18ee646d6c8e5..22b8ec864d1f1be978ebaa49807734c2e8ba0070 100755 --- a/Expes/YorkUrbanDB/data/moyennes/maltth.c +++ b/Expes/YorkUrbanDB/data/moyennes/maltth.c @@ -3,7 +3,6 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <malloc.h> #include <math.h> #define YORK_NB 102 diff --git a/Expes/YorkUrbanDB/data/moyennes/mang.c b/Expes/YorkUrbanDB/data/moyennes/mang.c index e4aa440c739c5f69ff226b7467a808c74af38138..3fb51bf4e2f17b0b6da159542c97992656486994 100755 --- a/Expes/YorkUrbanDB/data/moyennes/mang.c +++ b/Expes/YorkUrbanDB/data/moyennes/mang.c @@ -3,7 +3,6 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <malloc.h> #include <math.h> #define YORK_NB 102 diff --git a/Expes/YorkUrbanDB/data/moyennes/mcov.c b/Expes/YorkUrbanDB/data/moyennes/mcov.c index 2127e9ff9de0e064a835b4e893537d8263361ba3..7cddee65718bd49c84d1aa7b6a8476f7bb0b2a4e 100755 --- a/Expes/YorkUrbanDB/data/moyennes/mcov.c +++ b/Expes/YorkUrbanDB/data/moyennes/mcov.c @@ -3,7 +3,6 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <malloc.h> #include <math.h> #define YORK_NB 102 diff --git a/Expes/YorkUrbanDB/data/moyennes/mlines.c b/Expes/YorkUrbanDB/data/moyennes/mlines.c index cbdccdff250f6ca49a081755282b46982f9b841b..0610afbef3dfc920cba6f588cdbc6b27121d5cff 100755 --- a/Expes/YorkUrbanDB/data/moyennes/mlines.c +++ b/Expes/YorkUrbanDB/data/moyennes/mlines.c @@ -3,7 +3,6 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <malloc.h> #include <math.h> #define YORK_NB 102 diff --git a/Expes/YorkUrbanDB/data/moyennes/mprec.c b/Expes/YorkUrbanDB/data/moyennes/mprec.c index 627cf44acafccbb681cad6f493cec1c9949a5974..4bbd2d4126527fb399752138494bf93bd8e54d65 100644 --- a/Expes/YorkUrbanDB/data/moyennes/mprec.c +++ b/Expes/YorkUrbanDB/data/moyennes/mprec.c @@ -3,7 +3,6 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <malloc.h> #include <math.h> #define YORK_NB 102 diff --git a/Expes/YorkUrbanDB/data/moyennes/mtimes.c b/Expes/YorkUrbanDB/data/moyennes/mtimes.c index 2e32436af91015eb6595ef557b41709edf5ecd8c..110e7fab4d173f37c23e908e59787c2bbe735932 100755 --- a/Expes/YorkUrbanDB/data/moyennes/mtimes.c +++ b/Expes/YorkUrbanDB/data/moyennes/mtimes.c @@ -3,7 +3,6 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <malloc.h> #include <math.h> #define NB_MES 102