From: Karine Deschinkel Date: Fri, 4 Sep 2015 08:36:13 +0000 (+0200) Subject: fixed conflict X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/JournalMultiPeriods.git/commitdiff_plain/6a0a093a654ceb1379ce0aa8439c1650c04f9929?hp=8426ef678e715c447cdc24fca4221a005fb01ef9 fixed conflict --- diff --git a/F/ASR.eps b/F/ASR.eps index c6c11a9..d1dff83 100644 --- a/F/ASR.eps +++ b/F/ASR.eps @@ -2,7 +2,7 @@ %%BoundingBox: 53 53 536 402 %%HiResBoundingBox: 54 53.5 535 401.5 %%Creator: gnuplot 4.6 patchlevel 0 -%%CreationDate: Thu Sep 3 12:35:28 2015 +%%CreationDate: Thu Sep 3 16:43:16 2015 %%EndComments % EPSF created by ps2eps 1.68 %%BeginProlog @@ -513,7 +513,7 @@ SDict begin [ /Author (ali) % /Producer (gnuplot) % /Keywords () - /CreationDate (Thu Sep 3 12:35:28 2015) + /CreationDate (Thu Sep 3 16:43:16 2015) /DOCINFO pdfmark end } ifelse @@ -1251,462 +1251,6 @@ LT3 LT3 0.00 0.39 0.00 C 4382 3020 M 327 0 V -511 1829 M -38 0 V -38 0 V -38 0 V -38 0 V -38 0 V -38 0 V -38 2 V -38 -2 V -38 0 V -38 0 V -38 0 V -38 0 V -38 2 V -38 173 V -38 -17 V -38 -10 V -38 -6 V -38 18 V -38 -25 V -38 -23 V -38 83 V -38 3 V -38 0 V -38 -2 V -38 0 V -38 0 V -38 -3 V -37 -6 V -38 -2 V -38 -10 V -38 15 V -38 -28 V -38 8 V -38 -17 V -38 9 V -38 -9 V -38 4 V -38 1 V -38 0 V -38 -5 V -38 -16 V -38 -72 V -38 2 V -38 -25 V -38 -10 V -38 -5 V -38 0 V -38 -15 V -38 -276 V -38 -33 V -38 -23 V -38 -2 V -38 -7 V -38 -8 V -38 -25 V -38 -133 V -38 -10 V -38 -16 V -38 -9 V -38 -15 V -38 -31 V -38 -7 V -38 -302 V -38 -24 V -38 -51 V -38 -28 V -38 -14 V -38 -48 V -38 -13 V -38 -143 V -38 -27 V -38 -16 V -38 -15 V -38 -7 V -38 -8 V -38 -4 V -38 -86 V -38 -5 V -38 -2 V -38 -13 V -38 0 V -38 -5 V -38 -10 V -38 -33 V -38 -2 V -37 -10 V -38 0 V -38 -5 V -38 0 V -38 -5 V -38 -3 V -38 0 V -38 -2 V -38 -1 V -38 -4 V -38 -1 V -38 0 V -38 -4 V -38 0 V -38 0 V -38 0 V -38 -1 V -stroke 4385 354 M -38 0 V -38 0 V -38 -2 V -38 0 V -38 0 V -38 0 V -38 0 V -38 0 V -38 0 V -38 0 V -38 0 V -38 0 V -511 1829 DiaF -701 1829 DiaF -891 1829 DiaF -1081 1987 DiaF -1271 1941 DiaF -1461 2025 DiaF -1650 2004 DiaF -1840 1991 DiaF -2030 1982 DiaF -2220 1861 DiaF -2410 1532 DiaF -2600 1467 DiaF -2790 1284 DiaF -2980 869 DiaF -3170 623 DiaF -3360 550 DiaF -3550 440 DiaF -3740 390 DiaF -3929 370 DiaF -4119 360 DiaF -4309 355 DiaF -4499 352 DiaF -4689 352 DiaF -4545 3020 DiaF -% End plot #4 -% Begin plot #5 -1.000 UP -2.000 UL -LT4 -0.00 1.00 1.00 C LCb setrgbcolor -4316 2910 M -[ [(Helvetica) 110.0 0.0 true true 0 (TL-MuDiLCO-3)] -] -36.7 MRshow -LT4 -0.00 1.00 1.00 C 4382 2910 M -327 0 V -511 1834 M -38 2 V -38 -2 V -38 0 V -38 2 V -38 -2 V -38 0 V -38 2 V -38 -2 V -38 0 V -38 2 V -38 -2 V -38 20 V -38 -11 V -38 6 V -38 130 V -38 -17 V -38 -6 V -38 79 V -38 -5 V -38 2 V -38 3 V -38 0 V -38 -1 V -38 1 V -38 0 V -38 -1 V -38 0 V -37 3 V -38 -15 V -38 25 V -38 -2 V -38 -5 V -38 -6 V -38 -18 V -38 5 V -38 -25 V -38 11 V -38 -3 V -38 -12 V -38 0 V -38 -1 V -38 -9 V -38 -13 V -38 -5 V -38 -63 V -38 -15 V -38 -7 V -38 -148 V -38 -25 V -38 -18 V -38 -259 V -38 -15 V -38 8 V -38 -188 V -38 -15 V -38 -13 V -38 -91 V -38 -13 V -38 -35 V -38 -163 V -38 -22 V -38 2 V -38 -176 V -38 -14 V -38 -18 V -38 -88 V -38 -13 V -38 -2 V -38 -53 V -38 -3 V -38 -2 V -38 -33 V -38 -17 V -38 3 V -38 -33 V -38 -3 V -38 -5 V -38 -22 V -38 -5 V -38 2 V -38 -15 V -38 -3 V -38 -2 V -38 -5 V -38 -2 V -37 -3 V -38 0 V -38 -5 V -38 -2 V -38 -3 V -38 -3 V -38 0 V -38 -4 V -38 -1 V -38 0 V -38 0 V -38 -2 V -38 0 V -38 0 V -38 0 V -38 0 V -38 0 V -stroke 4385 352 M -38 0 V -38 0 V -38 0 V -38 0 V -38 0 V -38 0 V -38 0 V -38 0 V -38 0 V -38 0 V -38 0 V -38 0 V -511 1834 TriDF -701 1834 TriDF -891 1836 TriDF -1081 1979 TriDF -1271 2032 TriDF -1461 2035 TriDF -1650 2047 TriDF -1840 2021 TriDF -2030 1992 TriDF -2220 1901 TriDF -2410 1688 TriDF -2600 1219 TriDF -2790 904 TriDF -2980 676 TriDF -3170 517 TriDF -3360 435 TriDF -3550 402 TriDF -3740 375 TriDF -3929 362 TriDF -4119 354 TriDF -4309 352 TriDF -4499 352 TriDF -4689 352 TriDF -4545 2910 TriDF -% End plot #5 -% Begin plot #6 -1.000 UP -2.000 UL -LT5 -1.00 0.41 0.71 C LCb setrgbcolor -4316 2800 M -[ [(Helvetica) 110.0 0.0 true true 0 (TL-MuDiLCO-5)] -] -36.7 MRshow -LT5 -1.00 0.41 0.71 C 4382 2800 M -327 0 V -511 1834 M -38 0 V -38 0 V -38 0 V -38 -1 V -38 1 V -38 0 V -38 0 V -38 0 V -38 -1 V -38 13 V -38 -10 V -38 7 V -38 -4 V -38 10 V -38 127 V -38 0 V -38 -5 V -38 -10 V -38 -7 V -38 76 V -38 -1 V -38 0 V -38 -2 V -38 -2 V -38 12 V -38 -5 V -38 -2 V -37 -3 V -38 7 V -38 26 V -38 5 V -38 -6 V -38 -43 V -38 13 V -38 -10 V -38 2 V -38 -10 V -38 3 V -38 3 V -38 -20 V -38 0 V -38 7 V -38 -13 V -38 0 V -38 -110 V -38 -3 V -38 -24 V -38 -36 V -38 -10 V -38 -215 V -38 -34 V -38 -17 V -38 -13 V -38 -17 V -38 -133 V -38 0 V -38 -8 V -38 -20 V -38 -2 V -38 -204 V -38 -5 V -38 -14 V -38 -18 V -38 -15 V -38 -229 V -38 -37 V -38 -15 V -38 -36 V -38 -19 V -38 -117 V -38 -9 V -38 -3 V -38 -12 V -38 -10 V -38 -73 V -38 0 V -38 -10 V -38 -10 V -38 0 V -38 -53 V -38 -8 V -38 -5 V -38 -12 V -38 -8 V -38 -25 V -37 -13 V -38 -4 V -38 -1 V -38 -7 V -38 -7 V -38 2 V -38 0 V -38 -2 V -38 -5 V -38 -3 V -38 -2 V -38 0 V -38 -1 V -38 0 V -38 -2 V -38 -2 V -38 -1 V -stroke 4385 354 M -38 0 V -38 0 V -38 -2 V -38 0 V -38 0 V -38 0 V -38 0 V -38 0 V -38 0 V -38 0 V -38 0 V -38 0 V -511 1834 Circle -701 1834 Circle -891 1846 Circle -1081 1976 Circle -1271 2030 Circle -1461 2037 Circle -1650 2060 Circle -1840 2019 Circle -2030 1997 Circle -2220 1881 Circle -2410 1593 Circle -2600 1379 Circle -2790 1145 Circle -2980 864 Circle -3170 640 Circle -3360 533 Circle -3550 460 Circle -3740 402 Circle -3929 370 Circle -4119 362 Circle -4309 357 Circle -4499 352 Circle -4689 352 Circle -4545 2800 Circle -% End plot #6 -% Begin plot #7 -1.000 UP -2.000 UL -LT6 -0.49 0.99 0.00 C LCb setrgbcolor -4316 2690 M -[ [(Helvetica) 110.0 0.0 true true 0 (TL-MuDiLCO-7)] -] -36.7 MRshow -LT6 -0.49 0.99 0.00 C 4382 2690 M -327 0 V 511 1838 M 38 1 V 38 2 V @@ -1823,41 +1367,41 @@ stroke 4385 354 M 38 0 V 38 0 V 38 0 V -511 1838 Box -701 1839 Box -891 1838 Box -1081 1954 Box -1271 1972 Box -1461 2017 Box -1650 2044 Box -1840 2021 Box -2030 2007 Box -2220 1934 Box -2410 1593 Box -2600 1549 Box -2790 1341 Box -2980 925 Box -3170 669 Box -3360 603 Box -3550 478 Box -3740 394 Box -3929 375 Box -4119 365 Box -4309 354 Box -4499 352 Box -4689 352 Box -4545 2690 Box -% End plot #7 -% Begin plot #8 +511 1838 DiaF +701 1839 DiaF +891 1838 DiaF +1081 1954 DiaF +1271 1972 DiaF +1461 2017 DiaF +1650 2044 DiaF +1840 2021 DiaF +2030 2007 DiaF +2220 1934 DiaF +2410 1593 DiaF +2600 1549 DiaF +2790 1341 DiaF +2980 925 DiaF +3170 669 DiaF +3360 603 DiaF +3550 478 DiaF +3740 394 DiaF +3929 375 DiaF +4119 365 DiaF +4309 354 DiaF +4499 352 DiaF +4689 352 DiaF +4545 3020 DiaF +% End plot #4 +% Begin plot #5 1.000 UP 2.000 UL -LT7 +LT4 1.00 0.27 0.00 C LCb setrgbcolor -4316 2580 M +4316 2910 M [ [(Helvetica) 110.0 0.0 true true 0 (DESK)] ] -36.7 MRshow -LT7 -1.00 0.27 0.00 C 4382 2580 M +LT4 +1.00 0.27 0.00 C 4382 2910 M 327 0 V 511 2697 M 38 0 V @@ -1998,18 +1542,18 @@ stroke 4385 352 M 4309 352 BoxF 4499 352 BoxF 4689 352 BoxF -4545 2580 BoxF -% End plot #8 -% Begin plot #9 +4545 2910 BoxF +% End plot #5 +% Begin plot #6 1.000 UP 2.000 UL -LT8 +LT5 0.50 0.00 0.50 C LCb setrgbcolor -4316 2470 M +4316 2800 M [ [(Helvetica) 110.0 0.0 true true 0 (GAF)] ] -36.7 MRshow -LT8 -0.50 0.00 0.50 C 4382 2470 M +LT5 +0.50 0.00 0.50 C 4382 2800 M 327 0 V 511 3142 M 38 0 V @@ -2150,8 +1694,8 @@ stroke 4385 354 M 4309 354 PentF 4499 354 PentF 4689 354 PentF -4545 2470 PentF -% End plot #9 +4545 2800 PentF +% End plot #6 1.000 UL LTb 473 3468 N diff --git a/F/ASR.pdf b/F/ASR.pdf index 6a36083..c5e914a 100644 Binary files a/F/ASR.pdf and b/F/ASR.pdf differ diff --git a/F/CR.eps b/F/CR.eps index d82f96a..68c6ee4 100644 --- a/F/CR.eps +++ b/F/CR.eps @@ -2,7 +2,7 @@ %%BoundingBox: 53 53 536 402 %%HiResBoundingBox: 54 53.5 535 401.5 %%Creator: gnuplot 4.6 patchlevel 0 -%%CreationDate: Thu Sep 3 12:37:54 2015 +%%CreationDate: Thu Sep 3 16:45:44 2015 %%EndComments % EPSF created by ps2eps 1.68 %%BeginProlog @@ -513,7 +513,7 @@ SDict begin [ /Author (ali) % /Producer (gnuplot) % /Keywords () - /CreationDate (Thu Sep 3 12:37:54 2015) + /CreationDate (Thu Sep 3 16:45:44 2015) /DOCINFO pdfmark end } ifelse @@ -1251,462 +1251,6 @@ LT3 LT3 0.00 0.39 0.00 C 4261 3021 M 327 0 V -576 3422 M -38 1 V -37 -1 V -38 -1 V -37 1 V -37 0 V -38 -1 V -37 1 V -38 0 V -37 -1 V -37 0 V -38 0 V -37 1 V -38 -1 V -37 3 V -38 0 V -37 1 V -37 -8 V -38 5 V -37 -1 V -38 3 V -37 -2 V -37 2 V -38 -1 V -37 -3 V -38 -1 V -37 -2 V -37 3 V -38 -10 V -37 4 V -38 2 V -37 -1 V -37 -3 V -38 -5 V -37 -3 V -38 -18 V -37 -6 V -38 -2 V -37 -2 V -37 3 V -38 -3 V -37 -2 V -38 -59 V -37 0 V -37 4 V -38 -17 V -37 -6 V -38 5 V -37 -6 V -37 -279 V -38 -33 V -37 -37 V -38 -3 V -37 -3 V -37 -18 V -38 -3 V -37 -215 V -38 -26 V -37 -12 V -38 -11 V -37 -25 V -37 -55 V -38 -19 V -37 -490 V -38 -68 V -37 -137 V -37 -74 V -38 -67 V -37 -126 V -38 -10 V -37 -319 V -37 -96 V -38 -39 V -37 -67 V -38 -20 V -37 -27 V -37 -12 V -38 -263 V -37 -13 V -38 -32 V -37 -19 V -38 -15 V -37 -19 V -37 -37 V -38 -99 V -37 -4 V -38 -38 V -37 1 V -37 -19 V -38 -10 V -37 -18 V -38 -9 V -37 0 V -37 -5 V -38 -7 V -37 -15 V -38 -6 V -37 0 V -37 -13 V -38 1 V -37 0 V -38 -1 V -37 -5 V -stroke 4392 359 M -38 0 V -37 0 V -37 -7 V -38 0 V -37 0 V -38 0 V -37 0 V -37 0 V -38 0 V -37 0 V -38 0 V -37 0 V -576 3422 DiaF -763 3422 DiaF -950 3421 DiaF -1138 3424 DiaF -1325 3424 DiaF -1512 3419 DiaF -1699 3416 DiaF -1886 3386 DiaF -2073 3376 DiaF -2260 3302 DiaF -2447 2983 DiaF -2634 2919 DiaF -2821 2630 DiaF -3008 1861 DiaF -3195 1265 DiaF -3382 1016 DiaF -3569 677 DiaF -3756 503 DiaF -3943 419 DiaF -4130 383 DiaF -4317 365 DiaF -4504 352 DiaF -4691 352 DiaF -4424 3021 DiaF -% End plot #4 -% Begin plot #5 -1.000 UP -2.000 UL -LT4 -0.00 1.00 1.00 C LCb setrgbcolor -4195 2911 M -[ [(Helvetica) 110.0 0.0 true true 0 (TL-MuDiLCO-3)] -] -36.7 MRshow -LT4 -0.00 1.00 1.00 C 4261 2911 M -327 0 V -576 3422 M -38 0 V -37 0 V -38 0 V -37 0 V -37 0 V -38 0 V -37 0 V -38 0 V -37 0 V -37 0 V -38 0 V -37 -2 V -38 5 V -37 -2 V -38 2 V -37 -2 V -37 -5 V -38 4 V -37 -2 V -38 3 V -37 -3 V -37 -1 V -38 1 V -37 0 V -38 0 V -37 0 V -37 -2 V -38 0 V -37 3 V -38 -8 V -37 7 V -37 -8 V -38 -6 V -37 -6 V -38 5 V -37 -18 V -38 5 V -37 -1 V -37 -5 V -38 -2 V -37 1 V -38 -6 V -37 -6 V -37 -5 V -38 -48 V -37 -11 V -38 -3 V -37 -113 V -37 -12 V -38 -24 V -37 -337 V -38 -11 V -37 -2 V -37 -315 V -38 -21 V -37 -30 V -38 -182 V -37 -52 V -38 -44 V -37 -291 V -37 -57 V -38 -11 V -37 -397 V -38 -40 V -37 -22 V -37 -265 V -38 -39 V -37 -7 V -38 -157 V -37 -4 V -37 -10 V -38 -86 V -37 -44 V -38 4 V -37 -91 V -37 -18 V -38 -6 V -37 -70 V -38 -16 V -37 -5 V -38 -44 V -37 -12 V -37 -7 V -38 -21 V -37 -7 V -38 -10 V -37 -2 V -37 -18 V -38 -8 V -37 -11 V -38 -9 V -37 -6 V -37 -9 V -38 -8 V -37 0 V -38 0 V -37 -7 V -37 0 V -38 0 V -37 0 V -38 0 V -37 0 V -stroke 4392 352 M -38 0 V -37 0 V -37 0 V -38 0 V -37 0 V -38 0 V -37 0 V -37 0 V -38 0 V -37 0 V -38 0 V -37 0 V -576 3422 TriDF -763 3422 TriDF -950 3422 TriDF -1138 3425 TriDF -1325 3423 TriDF -1512 3420 TriDF -1699 3413 TriDF -1886 3405 TriDF -2073 3384 TriDF -2260 3320 TriDF -2447 3157 TriDF -2634 2471 TriDF -2821 1872 TriDF -3008 1345 TriDF -3195 873 TriDF -3382 646 TriDF -3569 531 TriDF -3756 440 TriDF -3943 391 TriDF -4130 359 TriDF -4317 352 TriDF -4504 352 TriDF -4691 352 TriDF -4424 2911 TriDF -% End plot #5 -% Begin plot #6 -1.000 UP -2.000 UL -LT5 -1.00 0.41 0.71 C LCb setrgbcolor -4195 2801 M -[ [(Helvetica) 110.0 0.0 true true 0 (TL-MuDiLCO-5)] -] -36.7 MRshow -LT5 -1.00 0.41 0.71 C 4261 2801 M -327 0 V -576 3421 M -38 0 V -37 0 V -38 -1 V -37 -1 V -37 2 V -38 0 V -37 0 V -38 -1 V -37 -1 V -37 5 V -38 -3 V -37 -1 V -38 0 V -37 3 V -38 -3 V -37 -1 V -37 -1 V -38 6 V -37 -2 V -38 1 V -37 1 V -37 -1 V -38 0 V -37 1 V -38 0 V -37 2 V -37 -1 V -38 -1 V -37 2 V -38 -8 V -37 1 V -37 -4 V -38 0 V -37 5 V -38 -29 V -37 2 V -38 -2 V -37 1 V -37 -1 V -38 -9 V -37 -2 V -38 2 V -37 -4 V -37 0 V -38 -80 V -37 13 V -38 -16 V -37 -18 V -37 -11 V -38 -216 V -37 -26 V -38 -23 V -37 -6 V -37 -18 V -38 -222 V -37 -4 V -38 -5 V -37 -27 V -38 -4 V -37 -344 V -37 -21 V -38 -18 V -37 -48 V -38 -47 V -37 -381 V -37 -70 V -38 -51 V -37 -94 V -38 -55 V -37 -300 V -37 -28 V -38 -14 V -37 -31 V -38 -32 V -37 -222 V -37 1 V -38 -32 V -37 -32 V -38 -5 V -37 -145 V -38 -28 V -37 -17 V -37 -53 V -38 -20 V -37 -74 V -38 -60 V -37 -12 V -37 -10 V -38 -23 V -37 -21 V -38 2 V -37 3 V -37 -12 V -38 -17 V -37 -8 V -38 -7 V -37 0 V -37 -8 V -38 0 V -37 -7 V -38 -7 V -37 -8 V -stroke 4392 359 M -38 0 V -37 0 V -37 -7 V -38 0 V -37 0 V -38 0 V -37 0 V -37 0 V -38 0 V -37 0 V -38 0 V -37 0 V -576 3421 Circle -763 3421 Circle -950 3424 Circle -1138 3420 Circle -1325 3423 Circle -1512 3424 Circle -1699 3418 Circle -1886 3391 Circle -2073 3382 Circle -2260 3298 Circle -2447 3050 Circle -2634 2755 Circle -2821 2371 Circle -3008 1856 Circle -3195 1286 Circle -3382 959 Circle -3569 746 Circle -3756 554 Circle -3943 428 Circle -4130 396 Circle -4317 374 Circle -4504 352 Circle -4691 352 Circle -4424 2801 Circle -% End plot #6 -% Begin plot #7 -1.000 UP -2.000 UL -LT6 -0.49 0.99 0.00 C LCb setrgbcolor -4195 2691 M -[ [(Helvetica) 110.0 0.0 true true 0 (TL-MuDiLCO-7)] -] -36.7 MRshow -LT6 -0.49 0.99 0.00 C 4261 2691 M -327 0 V 576 3421 M 38 -1 V 37 1 V @@ -1823,41 +1367,41 @@ stroke 4392 359 M 37 0 V 38 0 V 37 0 V -576 3421 Box -763 3422 Box -950 3420 Box -1138 3428 Box -1325 3423 Box -1512 3420 Box -1699 3422 Box -1886 3402 Box -2073 3395 Box -2260 3352 Box -2447 3075 Box -2634 3047 Box -2821 2747 Box -3008 1999 Box -3195 1377 Box -3382 1165 Box -3569 811 Box -3756 520 Box -3943 441 Box -4130 408 Box -4317 359 Box -4504 359 Box -4691 352 Box -4424 2691 Box -% End plot #7 -% Begin plot #8 +576 3421 DiaF +763 3422 DiaF +950 3420 DiaF +1138 3428 DiaF +1325 3423 DiaF +1512 3420 DiaF +1699 3422 DiaF +1886 3402 DiaF +2073 3395 DiaF +2260 3352 DiaF +2447 3075 DiaF +2634 3047 DiaF +2821 2747 DiaF +3008 1999 DiaF +3195 1377 DiaF +3382 1165 DiaF +3569 811 DiaF +3756 520 DiaF +3943 441 DiaF +4130 408 DiaF +4317 359 DiaF +4504 359 DiaF +4691 352 DiaF +4424 3021 DiaF +% End plot #4 +% Begin plot #5 1.000 UP 2.000 UL -LT7 +LT4 1.00 0.27 0.00 C LCb setrgbcolor -4195 2581 M +4195 2911 M [ [(Helvetica) 110.0 0.0 true true 0 (DESK)] ] -36.7 MRshow -LT7 -1.00 0.27 0.00 C 4261 2581 M +LT4 +1.00 0.27 0.00 C 4261 2911 M 327 0 V 576 3468 M 38 0 V @@ -1998,18 +1542,18 @@ stroke 4392 352 M 4317 352 BoxF 4504 352 BoxF 4691 352 BoxF -4424 2581 BoxF -% End plot #8 -% Begin plot #9 +4424 2911 BoxF +% End plot #5 +% Begin plot #6 1.000 UP 2.000 UL -LT8 +LT5 0.50 0.00 0.50 C LCb setrgbcolor -4195 2471 M +4195 2801 M [ [(Helvetica) 110.0 0.0 true true 0 (GAF)] ] -36.7 MRshow -LT8 -0.50 0.00 0.50 C 4261 2471 M +LT5 +0.50 0.00 0.50 C 4261 2801 M 327 0 V 576 3465 M 38 0 V @@ -2150,8 +1694,8 @@ stroke 4392 360 M 4317 359 PentF 4504 359 PentF 4691 359 PentF -4424 2471 PentF -% End plot #9 +4424 2801 PentF +% End plot #6 1.000 UL LTb 539 3468 N diff --git a/F/CR.pdf b/F/CR.pdf index 8ef101a..ee2c382 100644 Binary files a/F/CR.pdf and b/F/CR.pdf differ diff --git a/F/EC50.eps b/F/EC50.eps index 2f81957..92a0c6e 100644 --- a/F/EC50.eps +++ b/F/EC50.eps @@ -2,7 +2,7 @@ %%BoundingBox: 53 53 545 402 %%HiResBoundingBox: 54 53.5 544.5 401.5 %%Creator: gnuplot 4.6 patchlevel 0 -%%CreationDate: Thu Sep 3 12:41:05 2015 +%%CreationDate: Thu Sep 3 17:43:35 2015 %%EndComments % EPSF created by ps2eps 1.68 %%BeginProlog @@ -513,7 +513,7 @@ SDict begin [ /Author (ali) % /Producer (gnuplot) % /Keywords () - /CreationDate (Thu Sep 3 12:41:05 2015) + /CreationDate (Thu Sep 3 17:43:35 2015) /DOCINFO pdfmark end } ifelse @@ -876,95 +876,49 @@ LT3 327 0 V 1029 1311 M 847 202 V -847 172 V -847 431 V -847 709 V +847 119 V +847 108 V +847 72 V 1029 1311 DiaF 1876 1513 DiaF -2723 1685 DiaF -3570 2116 DiaF -4417 2825 DiaF +2723 1632 DiaF +3570 1740 DiaF +4417 1812 DiaF 1731 3062 DiaF % End plot #4 % Begin plot #5 1.000 UP 2.000 UL LT4 -0.00 1.00 1.00 C LCb setrgbcolor +0.49 0.99 0.00 C LCb setrgbcolor 1502 2952 M -[ [(Helvetica) 110.0 0.0 true true 0 (TL-MuDiLCO-3)] +[ [(Helvetica) 110.0 0.0 true true 0 (old-MuDiLCO-7)] ] -36.7 MRshow LT4 -0.00 1.00 1.00 C 1568 2952 M -327 0 V -1029 1409 M -847 150 V -847 122 V -847 60 V -847 90 V -1029 1409 TriDF -1876 1559 TriDF -2723 1681 TriDF -3570 1741 TriDF -4417 1831 TriDF -1731 2952 TriDF -% End plot #5 -% Begin plot #6 -1.000 UP -2.000 UL -LT5 -1.00 0.41 0.71 C LCb setrgbcolor -1502 2842 M -[ [(Helvetica) 110.0 0.0 true true 0 (TL-MuDiLCO-5)] -] -36.7 MRshow -LT5 -1.00 0.41 0.71 C 1568 2842 M -327 0 V -1029 1348 M -847 136 V -847 174 V -847 83 V -847 65 V -1029 1348 Circle -1876 1484 Circle -2723 1658 Circle -3570 1741 Circle -4417 1806 Circle -1731 2842 Circle -% End plot #6 -% Begin plot #7 -1.000 UP -2.000 UL -LT6 -0.49 0.99 0.00 C LCb setrgbcolor -1502 2732 M -[ [(Helvetica) 110.0 0.0 true true 0 (TL-MuDiLCO-7)] -] -36.7 MRshow -LT6 -0.49 0.99 0.00 C 1568 2732 M +0.49 0.99 0.00 C 1568 2952 M 327 0 V 1029 1311 M 847 202 V -847 119 V -847 108 V -847 72 V +847 172 V +847 431 V +847 709 V 1029 1311 Box 1876 1513 Box -2723 1632 Box -3570 1740 Box -4417 1812 Box -1731 2732 Box -% End plot #7 -% Begin plot #8 +2723 1685 Box +3570 2116 Box +4417 2825 Box +1731 2952 Box +% End plot #5 +% Begin plot #6 1.000 UP 2.000 UL -LT7 +LT5 1.00 0.27 0.00 C LCb setrgbcolor -1502 2622 M +1502 2842 M [ [(Helvetica) 110.0 0.0 true true 0 (DESK)] ] -36.7 MRshow -LT7 -1.00 0.27 0.00 C 1568 2622 M +LT5 +1.00 0.27 0.00 C 1568 2842 M 327 0 V 1029 2092 M 847 170 V @@ -976,18 +930,18 @@ LT7 2723 2481 BoxF 3570 2727 BoxF 4417 3160 BoxF -1731 2622 BoxF -% End plot #8 -% Begin plot #9 +1731 2842 BoxF +% End plot #6 +% Begin plot #7 1.000 UP 2.000 UL -LT8 +LT6 0.50 0.00 0.50 C LCb setrgbcolor -1502 2512 M +1502 2732 M [ [(Helvetica) 110.0 0.0 true true 0 (GAF)] ] -36.7 MRshow -LT8 -0.50 0.00 0.50 C 1568 2512 M +LT6 +0.50 0.00 0.50 C 1568 2732 M 327 0 V 1029 1793 M 847 183 V @@ -999,8 +953,8 @@ LT8 2723 2068 PentF 3570 2156 PentF 4417 2253 PentF -1731 2512 PentF -% End plot #9 +1731 2732 PentF +% End plot #7 1.000 UL LTb 605 3468 N diff --git a/F/EC50.pdf b/F/EC50.pdf index e2805be..81908fe 100644 Binary files a/F/EC50.pdf and b/F/EC50.pdf differ diff --git a/F/EC95.eps b/F/EC95.eps index 2f7c2f3..ecc2e32 100644 --- a/F/EC95.eps +++ b/F/EC95.eps @@ -2,7 +2,7 @@ %%BoundingBox: 53 53 545 399 %%HiResBoundingBox: 54 53.5 544.5 398 %%Creator: gnuplot 4.6 patchlevel 0 -%%CreationDate: Thu Sep 3 12:43:38 2015 +%%CreationDate: Thu Sep 3 17:48:12 2015 %%EndComments % EPSF created by ps2eps 1.68 %%BeginProlog @@ -513,7 +513,7 @@ SDict begin [ /Author (ali) % /Producer (gnuplot) % /Keywords () - /CreationDate (Thu Sep 3 12:43:38 2015) + /CreationDate (Thu Sep 3 17:48:12 2015) /DOCINFO pdfmark end } ifelse @@ -541,162 +541,162 @@ stroke ] -36.7 MRshow 1.000 UL LTb -605 542 M +605 537 M 63 0 V 4173 0 R -63 0 V stroke -539 542 M +539 537 M [ [(Helvetica) 110.0 0.0 true true 0 ( 250)] ] -36.7 MRshow 1.000 UL LTb -605 732 M +605 723 M 63 0 V 4173 0 R -63 0 V stroke -539 732 M +539 723 M [ [(Helvetica) 110.0 0.0 true true 0 ( 500)] ] -36.7 MRshow 1.000 UL LTb -605 922 M +605 908 M 63 0 V 4173 0 R -63 0 V stroke -539 922 M +539 908 M [ [(Helvetica) 110.0 0.0 true true 0 ( 750)] ] -36.7 MRshow 1.000 UL LTb -605 1112 M +605 1094 M 63 0 V 4173 0 R -63 0 V stroke -539 1112 M +539 1094 M [ [(Helvetica) 110.0 0.0 true true 0 ( 1000)] ] -36.7 MRshow 1.000 UL LTb -605 1302 M +605 1279 M 63 0 V 4173 0 R -63 0 V stroke -539 1302 M +539 1279 M [ [(Helvetica) 110.0 0.0 true true 0 ( 1250)] ] -36.7 MRshow 1.000 UL LTb -605 1492 M +605 1465 M 63 0 V 4173 0 R -63 0 V stroke -539 1492 M +539 1465 M [ [(Helvetica) 110.0 0.0 true true 0 ( 1500)] ] -36.7 MRshow 1.000 UL LTb -605 1682 M +605 1650 M 63 0 V 4173 0 R -63 0 V stroke -539 1682 M +539 1650 M [ [(Helvetica) 110.0 0.0 true true 0 ( 1750)] ] -36.7 MRshow 1.000 UL LTb -605 1872 M +605 1836 M 63 0 V 4173 0 R -63 0 V stroke -539 1872 M +539 1836 M [ [(Helvetica) 110.0 0.0 true true 0 ( 2000)] ] -36.7 MRshow 1.000 UL LTb -605 2062 M +605 2021 M 63 0 V 4173 0 R -63 0 V stroke -539 2062 M +539 2021 M [ [(Helvetica) 110.0 0.0 true true 0 ( 2250)] ] -36.7 MRshow 1.000 UL LTb -605 2252 M +605 2207 M 63 0 V 4173 0 R -63 0 V stroke -539 2252 M +539 2207 M [ [(Helvetica) 110.0 0.0 true true 0 ( 2500)] ] -36.7 MRshow 1.000 UL LTb -605 2442 M +605 2392 M 63 0 V 4173 0 R -63 0 V stroke -539 2442 M +539 2392 M [ [(Helvetica) 110.0 0.0 true true 0 ( 2750)] ] -36.7 MRshow 1.000 UL LTb -605 2632 M +605 2578 M 63 0 V 4173 0 R -63 0 V stroke -539 2632 M +539 2578 M [ [(Helvetica) 110.0 0.0 true true 0 ( 3000)] ] -36.7 MRshow 1.000 UL LTb -605 2822 M +605 2763 M 63 0 V 4173 0 R -63 0 V stroke -539 2822 M +539 2763 M [ [(Helvetica) 110.0 0.0 true true 0 ( 3250)] ] -36.7 MRshow 1.000 UL LTb -605 3012 M +605 2949 M 63 0 V 4173 0 R -63 0 V stroke -539 3012 M +539 2949 M [ [(Helvetica) 110.0 0.0 true true 0 ( 3500)] ] -36.7 MRshow 1.000 UL LTb -605 3202 M +605 3134 M 63 0 V 4173 0 R -63 0 V stroke -539 3202 M +539 3134 M [ [(Helvetica) 110.0 0.0 true true 0 ( 3750)] ] -36.7 MRshow 1.000 UL LTb -605 3392 M +605 3320 M 63 0 V 4173 0 R -63 0 V stroke -539 3392 M +539 3320 M [ [(Helvetica) 110.0 0.0 true true 0 ( 4000)] ] -36.7 MRshow 1.000 UL @@ -839,208 +839,162 @@ LTb 2.000 UL LT0 0.00 0.55 0.55 C LCb setrgbcolor -1502 3413 M +1502 3398 M [ [(Helvetica) 110.0 0.0 true true 0 (MuDiLCO-1)] ] -36.7 MRshow LT0 -0.00 0.55 0.55 C 1568 3413 M +0.00 0.55 0.55 C 1568 3398 M 327 0 V -1029 1220 M -847 131 V -847 87 V -847 74 V -847 71 V -1029 1220 TriUF -1876 1351 TriUF -2723 1438 TriUF -3570 1512 TriUF -4417 1583 TriUF -1731 3413 TriUF +1029 1199 M +847 128 V +847 85 V +847 72 V +847 70 V +1029 1199 TriUF +1876 1327 TriUF +2723 1412 TriUF +3570 1484 TriUF +4417 1554 TriUF +1731 3398 TriUF % End plot #1 % Begin plot #2 1.000 UP 2.000 UL LT1 0.50 0.00 0.00 C LCb setrgbcolor -1502 3303 M +1502 3288 M [ [(Helvetica) 110.0 0.0 true true 0 (MuDiLCO-3)] ] -36.7 MRshow LT1 -0.50 0.00 0.00 C 1568 3303 M +0.50 0.00 0.00 C 1568 3288 M 327 0 V -1029 1216 M -847 118 V -847 74 V -847 53 V -847 56 V -1029 1216 Star -1876 1334 Star -2723 1408 Star -3570 1461 Star -4417 1517 Star -1731 3303 Star +1029 1195 M +847 116 V +847 72 V +847 52 V +847 54 V +1029 1195 Star +1876 1311 Star +2723 1383 Star +3570 1435 Star +4417 1489 Star +1731 3288 Star % End plot #2 % Begin plot #3 1.000 UP 2.000 UL LT2 0.00 0.00 0.55 C LCb setrgbcolor -1502 3193 M +1502 3178 M [ [(Helvetica) 110.0 0.0 true true 0 (MuDiLCO-5)] ] -36.7 MRshow LT2 -0.00 0.00 0.55 C 1568 3193 M +0.00 0.00 0.55 C 1568 3178 M 327 0 V -1029 1208 M -847 126 V -847 77 V -847 71 V -847 88 V -1029 1208 CircleF -1876 1334 CircleF -2723 1411 CircleF -3570 1482 CircleF -4417 1570 CircleF -1731 3193 CircleF +1029 1187 M +847 123 V +847 76 V +847 69 V +847 86 V +1029 1187 CircleF +1876 1310 CircleF +2723 1386 CircleF +3570 1455 CircleF +4417 1541 CircleF +1731 3178 CircleF % End plot #3 % Begin plot #4 1.000 UP 2.000 UL LT3 0.00 0.39 0.00 C LCb setrgbcolor -1502 3083 M +1502 3068 M [ [(Helvetica) 110.0 0.0 true true 0 (MuDiLCO-7)] ] -36.7 MRshow LT3 -0.00 0.39 0.00 C 1568 3083 M +0.00 0.39 0.00 C 1568 3068 M 327 0 V -1029 1211 M -847 131 V -847 103 V -847 520 V -847 1458 V -1029 1211 DiaF -1876 1342 DiaF -2723 1445 DiaF -3570 1965 DiaF -4417 3423 DiaF -1731 3083 DiaF +1029 1191 M +847 127 V +847 54 V +847 63 V +847 45 V +1029 1191 DiaF +1876 1318 DiaF +2723 1372 DiaF +3570 1435 DiaF +4417 1480 DiaF +1731 3068 DiaF % End plot #4 % Begin plot #5 1.000 UP 2.000 UL LT4 -0.00 1.00 1.00 C LCb setrgbcolor -1502 2973 M -[ [(Helvetica) 110.0 0.0 true true 0 (TL-MuDiLCO-3)] +0.49 0.99 0.00 C LCb setrgbcolor +1502 2958 M +[ [(Helvetica) 110.0 0.0 true true 0 (old-MuDiLCO-7)] ] -36.7 MRshow LT4 -0.00 1.00 1.00 C 1568 2973 M +0.49 0.99 0.00 C 1568 2958 M 327 0 V -1029 1216 M -847 118 V -847 74 V -847 49 V -847 56 V -1029 1216 TriDF -1876 1334 TriDF -2723 1408 TriDF -3570 1457 TriDF -4417 1513 TriDF -1731 2973 TriDF +1029 1191 M +847 127 V +847 101 V +847 508 V +847 1423 V +1029 1191 Box +1876 1318 Box +2723 1419 Box +3570 1927 Box +4417 3350 Box +1731 2958 Box % End plot #5 % Begin plot #6 1.000 UP 2.000 UL LT5 -1.00 0.41 0.71 C LCb setrgbcolor -1502 2863 M -[ [(Helvetica) 110.0 0.0 true true 0 (TL-MuDiLCO-5)] +1.00 0.27 0.00 C LCb setrgbcolor +1502 2848 M +[ [(Helvetica) 110.0 0.0 true true 0 (DESK)] ] -36.7 MRshow LT5 -1.00 0.41 0.71 C 1568 2863 M +1.00 0.27 0.00 C 1568 2848 M 327 0 V -1029 1208 M -847 126 V -847 77 V -847 46 V -847 42 V -1029 1208 Circle -1876 1334 Circle -2723 1411 Circle -3570 1457 Circle -4417 1499 Circle -1731 2863 Circle +1029 1672 M +847 107 V +847 275 V +847 199 V +847 250 V +1029 1672 BoxF +1876 1779 BoxF +2723 2054 BoxF +3570 2253 BoxF +4417 2503 BoxF +1731 2848 BoxF % End plot #6 % Begin plot #7 1.000 UP 2.000 UL LT6 -0.49 0.99 0.00 C LCb setrgbcolor -1502 2753 M -[ [(Helvetica) 110.0 0.0 true true 0 (TL-MuDiLCO-7)] -] -36.7 MRshow -LT6 -0.49 0.99 0.00 C 1568 2753 M -327 0 V -1029 1211 M -847 131 V -847 55 V -847 64 V -847 46 V -1029 1211 Box -1876 1342 Box -2723 1397 Box -3570 1461 Box -4417 1507 Box -1731 2753 Box -% End plot #7 -% Begin plot #8 -1.000 UP -2.000 UL -LT7 -1.00 0.27 0.00 C LCb setrgbcolor -1502 2643 M -[ [(Helvetica) 110.0 0.0 true true 0 (DESK)] -] -36.7 MRshow -LT7 -1.00 0.27 0.00 C 1568 2643 M -327 0 V -1029 1704 M -847 110 V -847 282 V -847 204 V -847 255 V -1029 1704 BoxF -1876 1814 BoxF -2723 2096 BoxF -3570 2300 BoxF -4417 2555 BoxF -1731 2643 BoxF -% End plot #8 -% Begin plot #9 -1.000 UP -2.000 UL -LT8 0.50 0.00 0.50 C LCb setrgbcolor -1502 2533 M +1502 2738 M [ [(Helvetica) 110.0 0.0 true true 0 (GAF)] ] -36.7 MRshow -LT8 -0.50 0.00 0.50 C 1568 2533 M +LT6 +0.50 0.00 0.50 C 1568 2738 M 327 0 V -1029 1522 M -847 360 V -847 42 V +1029 1495 M +847 350 V +847 41 V 847 32 V -847 93 V -1029 1522 PentF -1876 1882 PentF -2723 1924 PentF -3570 1956 PentF -4417 2049 PentF -1731 2533 PentF -% End plot #9 +847 90 V +1029 1495 PentF +1876 1845 PentF +2723 1886 PentF +3570 1918 PentF +4417 2008 PentF +1731 2738 PentF +% End plot #7 1.000 UL LTb 605 3468 N diff --git a/F/EC95.pdf b/F/EC95.pdf index dae4968..8ba8bae 100644 Binary files a/F/EC95.pdf and b/F/EC95.pdf differ diff --git a/F/LT50.eps b/F/LT50.eps index 6b0e3aa..a6507fc 100644 --- a/F/LT50.eps +++ b/F/LT50.eps @@ -2,7 +2,7 @@ %%BoundingBox: 53 53 545 402 %%HiResBoundingBox: 54 53.5 544.5 401.5 %%Creator: gnuplot 4.6 patchlevel 0 -%%CreationDate: Thu Sep 3 12:47:34 2015 +%%CreationDate: Thu Sep 3 16:56:46 2015 %%EndComments % EPSF created by ps2eps 1.68 %%BeginProlog @@ -513,7 +513,7 @@ SDict begin [ /Author (ali) % /Producer (gnuplot) % /Keywords () - /CreationDate (Thu Sep 3 12:47:34 2015) + /CreationDate (Thu Sep 3 16:56:46 2015) /DOCINFO pdfmark end } ifelse @@ -789,11 +789,11 @@ LTb 2.000 UL LT0 0.00 0.55 0.55 C LCb setrgbcolor -1457 3356 M +1285 3356 M [ [(Helvetica) 110.0 0.0 true true 0 (MuDiLCO-1)] ] -36.7 MRshow LT0 -0.00 0.55 0.55 C 1523 3356 M +0.00 0.55 0.55 C 1351 3356 M 327 0 V 969 1230 M 861 510 V @@ -805,18 +805,18 @@ LT0 2690 2193 TriUF 3550 2618 TriUF 4411 3043 TriUF -1686 3356 TriUF +1514 3356 TriUF % End plot #1 % Begin plot #2 1.000 UP 2.000 UL LT1 0.50 0.00 0.00 C LCb setrgbcolor -1457 3246 M +1285 3246 M [ [(Helvetica) 110.0 0.0 true true 0 (MuDiLCO-3)] ] -36.7 MRshow LT1 -0.50 0.00 0.00 C 1523 3246 M +0.50 0.00 0.00 C 1351 3246 M 327 0 V 969 947 M 861 595 V @@ -828,18 +828,18 @@ LT1 2690 2052 Star 3550 2562 Star 4411 3071 Star -1686 3246 Star +1514 3246 Star % End plot #2 % Begin plot #3 1.000 UP 2.000 UL LT2 0.00 0.00 0.55 C LCb setrgbcolor -1457 3136 M +1285 3136 M [ [(Helvetica) 110.0 0.0 true true 0 (MuDiLCO-5)] ] -36.7 MRshow LT2 -0.00 0.00 0.55 C 1523 3136 M +0.00 0.00 0.55 C 1351 3136 M 327 0 V 969 1060 M 861 708 V @@ -851,110 +851,41 @@ LT2 2690 2193 CircleF 3550 2675 CircleF 4411 3100 CircleF -1686 3136 CircleF +1514 3136 CircleF % End plot #3 % Begin plot #4 1.000 UP 2.000 UL LT3 0.00 0.39 0.00 C LCb setrgbcolor -1457 3026 M +1285 3026 M [ [(Helvetica) 110.0 0.0 true true 0 (MuDiLCO-7)] ] -36.7 MRshow LT3 -0.00 0.39 0.00 C 1523 3026 M +0.00 0.39 0.00 C 1351 3026 M 327 0 V 969 1145 M 861 595 V -860 453 V -860 454 V -861 368 V +860 510 V +860 481 V +861 454 V 969 1145 DiaF 1830 1740 DiaF -2690 2193 DiaF -3550 2647 DiaF -4411 3015 DiaF -1686 3026 DiaF +2690 2250 DiaF +3550 2731 DiaF +4411 3185 DiaF +1514 3026 DiaF % End plot #4 % Begin plot #5 1.000 UP 2.000 UL LT4 -0.00 1.00 1.00 C LCb setrgbcolor -1457 2916 M -[ [(Helvetica) 110.0 0.0 true true 0 (TL-MuDiLCO-3)] -] -36.7 MRshow -LT4 -0.00 1.00 1.00 C 1523 2916 M -327 0 V -969 947 M -861 595 V -860 510 V -860 595 V -861 424 V -969 947 TriDF -1830 1542 TriDF -2690 2052 TriDF -3550 2647 TriDF -4411 3071 TriDF -1686 2916 TriDF -% End plot #5 -% Begin plot #6 -1.000 UP -2.000 UL -LT5 -1.00 0.41 0.71 C LCb setrgbcolor -1457 2806 M -[ [(Helvetica) 110.0 0.0 true true 0 (TL-MuDiLCO-5)] -] -36.7 MRshow -LT5 -1.00 0.41 0.71 C 1523 2806 M -327 0 V -969 1060 M -861 708 V -860 425 V -860 538 V -861 454 V -969 1060 Circle -1830 1768 Circle -2690 2193 Circle -3550 2731 Circle -4411 3185 Circle -1686 2806 Circle -% End plot #6 -% Begin plot #7 -1.000 UP -2.000 UL -LT6 -0.49 0.99 0.00 C LCb setrgbcolor -1457 2696 M -[ [(Helvetica) 110.0 0.0 true true 0 (TL-MuDiLCO-7)] -] -36.7 MRshow -LT6 -0.49 0.99 0.00 C 1523 2696 M -327 0 V -969 1145 M -861 595 V -860 510 V -860 481 V -861 454 V -969 1145 Box -1830 1740 Box -2690 2250 Box -3550 2731 Box -4411 3185 Box -1686 2696 Box -% End plot #7 -% Begin plot #8 -1.000 UP -2.000 UL -LT7 1.00 0.27 0.00 C LCb setrgbcolor -1457 2586 M +1285 2916 M [ [(Helvetica) 110.0 0.0 true true 0 (DESK)] ] -36.7 MRshow -LT7 -1.00 0.27 0.00 C 1523 2586 M +LT4 +1.00 0.27 0.00 C 1351 2916 M 327 0 V 969 834 M 861 424 V @@ -966,18 +897,18 @@ LT7 2690 1598 BoxF 3550 1910 BoxF 4411 2052 BoxF -1686 2586 BoxF -% End plot #8 -% Begin plot #9 +1514 2916 BoxF +% End plot #5 +% Begin plot #6 1.000 UP 2.000 UL -LT8 +LT5 0.50 0.00 0.50 C LCb setrgbcolor -1457 2476 M +1285 2806 M [ [(Helvetica) 110.0 0.0 true true 0 (GAF)] ] -36.7 MRshow -LT8 -0.50 0.00 0.50 C 1523 2476 M +LT5 +0.50 0.00 0.50 C 1351 2806 M 327 0 V 969 890 M 861 453 V @@ -989,8 +920,8 @@ LT8 2690 1797 PentF 3550 2222 PentF 4411 2590 PentF -1686 2476 PentF -% End plot #9 +1514 2806 PentF +% End plot #6 1.000 UL LTb 539 3468 N diff --git a/F/LT50.pdf b/F/LT50.pdf index 7e0d671..086d993 100644 Binary files a/F/LT50.pdf and b/F/LT50.pdf differ diff --git a/F/LT95.eps b/F/LT95.eps index c384c34..4a0187e 100644 --- a/F/LT95.eps +++ b/F/LT95.eps @@ -2,7 +2,7 @@ %%BoundingBox: 53 53 545 402 %%HiResBoundingBox: 54 53.5 544.5 401.5 %%Creator: gnuplot 4.6 patchlevel 0 -%%CreationDate: Thu Sep 3 12:50:18 2015 +%%CreationDate: Thu Sep 3 17:19:26 2015 %%EndComments % EPSF created by ps2eps 1.68 %%BeginProlog @@ -513,7 +513,7 @@ SDict begin [ /Author (ali) % /Producer (gnuplot) % /Keywords () - /CreationDate (Thu Sep 3 12:50:18 2015) + /CreationDate (Thu Sep 3 17:19:26 2015) /DOCINFO pdfmark end } ifelse @@ -769,11 +769,11 @@ LTb 2.000 UL LT0 0.00 0.55 0.55 C LCb setrgbcolor -1412 3344 M +1237 3344 M [ [(Helvetica) 110.0 0.0 true true 0 (MuDiLCO-1)] ] -36.7 MRshow LT0 -0.00 0.55 0.55 C 1478 3344 M +0.00 0.55 0.55 C 1303 3344 M 327 0 V 910 837 M 873 588 V @@ -785,18 +785,18 @@ LT0 2657 1979 TriUF 3531 2464 TriUF 4404 2914 TriUF -1641 3344 TriUF +1466 3344 TriUF % End plot #1 % Begin plot #2 1.000 UP 2.000 UL LT1 0.50 0.00 0.00 C LCb setrgbcolor -1412 3234 M +1237 3234 M [ [(Helvetica) 110.0 0.0 true true 0 (MuDiLCO-3)] ] -36.7 MRshow LT1 -0.50 0.00 0.00 C 1478 3234 M +0.50 0.00 0.00 C 1303 3234 M 327 0 V 910 871 M 873 520 V @@ -808,18 +808,18 @@ LT1 2657 1945 Star 3531 2533 Star 4404 2949 Star -1641 3234 Star +1466 3234 Star % End plot #2 % Begin plot #3 1.000 UP 2.000 UL LT2 0.00 0.00 0.55 C LCb setrgbcolor -1412 3124 M +1237 3124 M [ [(Helvetica) 110.0 0.0 true true 0 (MuDiLCO-5)] ] -36.7 MRshow LT2 -0.00 0.00 0.55 C 1478 3124 M +0.00 0.00 0.55 C 1303 3124 M 327 0 V 910 871 M 873 520 V @@ -831,110 +831,41 @@ LT2 2657 1910 CircleF 3531 2429 CircleF 4404 2776 CircleF -1641 3124 CircleF +1466 3124 CircleF % End plot #3 % Begin plot #4 1.000 UP 2.000 UL LT3 0.00 0.39 0.00 C LCb setrgbcolor -1412 3014 M +1237 3014 M [ [(Helvetica) 110.0 0.0 true true 0 (MuDiLCO-7)] ] -36.7 MRshow LT3 -0.00 0.39 0.00 C 1478 3014 M +0.00 0.39 0.00 C 1303 3014 M 327 0 V 910 837 M 873 519 V -874 554 V -874 138 V -873 -450 V +874 692 V +874 485 V +873 485 V 910 837 DiaF 1783 1356 DiaF -2657 1910 DiaF -3531 2048 DiaF -4404 1598 DiaF -1641 3014 DiaF +2657 2048 DiaF +3531 2533 DiaF +4404 3018 DiaF +1466 3014 DiaF % End plot #4 % Begin plot #5 1.000 UP 2.000 UL LT4 -0.00 1.00 1.00 C LCb setrgbcolor -1412 2904 M -[ [(Helvetica) 110.0 0.0 true true 0 (TL-MuDiLCO-3)] -] -36.7 MRshow -LT4 -0.00 1.00 1.00 C 1478 2904 M -327 0 V -910 871 M -873 520 V -874 554 V -874 588 V -873 450 V -910 871 TriDF -1783 1391 TriDF -2657 1945 TriDF -3531 2533 TriDF -4404 2983 TriDF -1641 2904 TriDF -% End plot #5 -% Begin plot #6 -1.000 UP -2.000 UL -LT5 -1.00 0.41 0.71 C LCb setrgbcolor -1412 2794 M -[ [(Helvetica) 110.0 0.0 true true 0 (TL-MuDiLCO-5)] -] -36.7 MRshow -LT5 -1.00 0.41 0.71 C 1478 2794 M -327 0 V -910 871 M -873 520 V -874 519 V -874 519 V -873 658 V -910 871 Circle -1783 1391 Circle -2657 1910 Circle -3531 2429 Circle -4404 3087 Circle -1641 2794 Circle -% End plot #6 -% Begin plot #7 -1.000 UP -2.000 UL -LT6 -0.49 0.99 0.00 C LCb setrgbcolor -1412 2684 M -[ [(Helvetica) 110.0 0.0 true true 0 (TL-MuDiLCO-7)] -] -36.7 MRshow -LT6 -0.49 0.99 0.00 C 1478 2684 M -327 0 V -910 837 M -873 519 V -874 692 V -874 485 V -873 485 V -910 837 Box -1783 1356 Box -2657 2048 Box -3531 2533 Box -4404 3018 Box -1641 2684 Box -% End plot #7 -% Begin plot #8 -1.000 UP -2.000 UL -LT7 1.00 0.27 0.00 C LCb setrgbcolor -1412 2574 M +1237 2904 M [ [(Helvetica) 110.0 0.0 true true 0 (DESK)] ] -36.7 MRshow -LT7 -1.00 0.27 0.00 C 1478 2574 M +LT4 +1.00 0.27 0.00 C 1303 2904 M 327 0 V 910 871 M 873 485 V @@ -946,18 +877,18 @@ LT7 2657 1495 BoxF 3531 1910 BoxF 4404 2187 BoxF -1641 2574 BoxF -% End plot #8 -% Begin plot #9 +1466 2904 BoxF +% End plot #5 +% Begin plot #6 1.000 UP 2.000 UL -LT8 +LT5 0.50 0.00 0.50 C LCb setrgbcolor -1412 2464 M +1237 2794 M [ [(Helvetica) 110.0 0.0 true true 0 (GAF)] ] -36.7 MRshow -LT8 -0.50 0.00 0.50 C 1478 2464 M +LT5 +0.50 0.00 0.50 C 1303 2794 M 327 0 V 910 871 M 873 139 V @@ -969,8 +900,8 @@ LT8 2657 1495 PentF 3531 1979 PentF 4404 2256 PentF -1641 2464 PentF -% End plot #9 +1466 2794 PentF +% End plot #6 1.000 UL LTb 473 3468 N diff --git a/F/LT95.pdf b/F/LT95.pdf index e39b413..caf7226 100644 Binary files a/F/LT95.pdf and b/F/LT95.pdf differ diff --git a/F/SR.eps b/F/SR.eps index 793bbf9..f9d9840 100644 --- a/F/SR.eps +++ b/F/SR.eps @@ -2,7 +2,7 @@ %%BoundingBox: 53 53 536 402 %%HiResBoundingBox: 54 53.5 535 401.5 %%Creator: gnuplot 4.6 patchlevel 0 -%%CreationDate: Thu Sep 3 12:52:56 2015 +%%CreationDate: Thu Sep 3 16:49:52 2015 %%EndComments % EPSF created by ps2eps 1.68 %%BeginProlog @@ -469,7 +469,7 @@ SDict begin [ /Author (ali) % /Producer (gnuplot) % /Keywords () - /CreationDate (Thu Sep 3 12:52:56 2015) + /CreationDate (Thu Sep 3 16:49:52 2015) /DOCINFO pdfmark end } ifelse @@ -725,11 +725,11 @@ LTb 2.000 UL LT0 0.00 0.55 0.55 C LCb setrgbcolor -1476 3344 M +1212 3344 M [ [(Helvetica) 110.0 0.0 true true 0 (MuDiLCO-1)] ] -36.7 MRshow LT0 -0.00 0.55 0.55 C 1542 3344 M +0.00 0.55 0.55 C 1278 3344 M 327 0 V 3530 352 M 28 208 V @@ -774,18 +774,18 @@ LT0 4313 3330 TriUF 4501 3468 TriUF 4690 3468 TriUF -1705 3344 TriUF +1441 3344 TriUF % End plot #1 % Begin plot #2 1.000 UP 2.000 UL LT1 0.50 0.00 0.00 C LCb setrgbcolor -1476 3234 M +1212 3234 M [ [(Helvetica) 110.0 0.0 true true 0 (MuDiLCO-3)] ] -36.7 MRshow LT1 -0.50 0.00 0.00 C 1542 3234 M +0.50 0.00 0.00 C 1278 3234 M 327 0 V 3313 352 M 19 69 V @@ -837,18 +837,18 @@ LT1 4313 3468 Star 4501 3468 Star 4690 3468 Star -1705 3234 Star +1441 3234 Star % End plot #2 % Begin plot #3 1.000 UP 2.000 UL LT2 0.00 0.00 0.55 C LCb setrgbcolor -1476 3124 M +1212 3124 M [ [(Helvetica) 110.0 0.0 true true 0 (MuDiLCO-5)] ] -36.7 MRshow LT2 -0.00 0.00 0.55 C 1542 3124 M +0.00 0.00 0.55 C 1278 3124 M 327 0 V 3615 352 M 18 208 V @@ -890,197 +890,18 @@ LT2 4313 3053 CircleF 4501 3468 CircleF 4690 3468 CircleF -1705 3124 CircleF +1441 3124 CircleF % End plot #3 % Begin plot #4 1.000 UP 2.000 UL LT3 0.00 0.39 0.00 C LCb setrgbcolor -1476 3014 M +1212 3014 M [ [(Helvetica) 110.0 0.0 true true 0 (MuDiLCO-7)] ] -36.7 MRshow LT3 -0.00 0.39 0.00 C 1542 3014 M -327 0 V -3313 352 M -19 69 V -37 0 V -38 0 V -38 0 V -37 0 V -38 277 V -38 0 V -38 0 V -37 0 V -38 277 V -38 416 V -38 0 V -37 415 V -38 0 V -38 277 V -38 0 V -37 139 V -38 138 V -38 0 V -38 139 V -37 138 V -38 277 V -38 139 V -37 0 V -38 138 V -38 0 V -38 0 V -37 0 V -38 139 V -38 0 V -38 0 V -37 138 V -38 0 V -38 0 V -38 0 V -37 0 V -38 0 V -38 0 V -38 0 V -37 0 V -38 0 V -3369 421 DiaF -3558 698 DiaF -3747 1391 DiaF -3935 2222 DiaF -4124 2914 DiaF -4313 3191 DiaF -4501 3468 DiaF -4690 3468 DiaF -1705 3014 DiaF -% End plot #4 -% Begin plot #5 -1.000 UP -2.000 UL -LT4 -0.00 1.00 1.00 C LCb setrgbcolor -1476 2904 M -[ [(Helvetica) 110.0 0.0 true true 0 (TL-MuDiLCO-3)] -] -36.7 MRshow -LT4 -0.00 1.00 1.00 C 1542 2904 M -327 0 V -3313 352 M -19 69 V -37 0 V -38 0 V -38 0 V -37 277 V -38 277 V -38 139 V -38 138 V -37 139 V -38 138 V -38 277 V -38 139 V -37 138 V -38 0 V -38 416 V -38 138 V -37 139 V -38 138 V -38 139 V -38 138 V -37 139 V -38 0 V -38 0 V -37 138 V -38 0 V -38 0 V -38 0 V -37 0 V -38 0 V -38 0 V -38 0 V -37 0 V -38 0 V -38 0 V -38 0 V -37 0 V -38 0 V -38 0 V -38 0 V -37 0 V -38 0 V -3369 421 TriDF -3558 1114 TriDF -3747 1945 TriDF -3935 2776 TriDF -4124 3330 TriDF -4313 3468 TriDF -4501 3468 TriDF -4690 3468 TriDF -1705 2904 TriDF -% End plot #5 -% Begin plot #6 -1.000 UP -2.000 UL -LT5 -1.00 0.41 0.71 C LCb setrgbcolor -1476 2794 M -[ [(Helvetica) 110.0 0.0 true true 0 (TL-MuDiLCO-5)] -] -36.7 MRshow -LT5 -1.00 0.41 0.71 C 1542 2794 M -327 0 V -3615 352 M -18 208 V -38 277 V -38 0 V -38 138 V -37 554 V -38 139 V -38 138 V -38 139 V -37 138 V -38 0 V -38 0 V -38 277 V -37 139 V -38 138 V -38 139 V -37 0 V -38 138 V -38 0 V -38 139 V -37 138 V -38 139 V -38 0 V -38 0 V -37 138 V -38 0 V -38 0 V -38 0 V -37 0 V -38 0 V -38 0 V -38 0 V -37 0 V -38 0 V -3747 975 Circle -3935 2083 Circle -4124 2637 Circle -4313 3053 Circle -4501 3468 Circle -4690 3468 Circle -1705 2794 Circle -% End plot #6 -% Begin plot #7 -1.000 UP -2.000 UL -LT6 -0.49 0.99 0.00 C LCb setrgbcolor -1476 2684 M -[ [(Helvetica) 110.0 0.0 true true 0 (TL-MuDiLCO-7)] -] -36.7 MRshow -LT6 -0.49 0.99 0.00 C 1542 2684 M +0.00 0.39 0.00 C 1278 3014 M 327 0 V 3501 352 M 19 69 V @@ -1119,25 +940,25 @@ LT6 38 0 V 37 0 V 38 0 V -3558 421 Box -3747 1252 Box -3935 1945 Box -4124 2360 Box -4313 3330 Box -4501 3330 Box -4690 3468 Box -1705 2684 Box -% End plot #7 -% Begin plot #8 +3558 421 DiaF +3747 1252 DiaF +3935 1945 DiaF +4124 2360 DiaF +4313 3330 DiaF +4501 3330 DiaF +4690 3468 DiaF +1441 3014 DiaF +% End plot #4 +% Begin plot #5 1.000 UP 2.000 UL -LT7 +LT4 1.00 0.27 0.00 C LCb setrgbcolor -1476 2574 M +1212 2904 M [ [(Helvetica) 110.0 0.0 true true 0 (DESK)] ] -36.7 MRshow -LT7 -1.00 0.27 0.00 C 1542 2574 M +LT4 +1.00 0.27 0.00 C 1278 2904 M 327 0 V 2166 352 M 33 485 V @@ -1225,18 +1046,18 @@ LT7 4313 3468 BoxF 4501 3468 BoxF 4690 3468 BoxF -1705 2574 BoxF -% End plot #8 -% Begin plot #9 +1441 2904 BoxF +% End plot #5 +% Begin plot #6 1.000 UP 2.000 UL -LT8 +LT5 0.50 0.00 0.50 C LCb setrgbcolor -1476 2464 M +1212 2794 M [ [(Helvetica) 110.0 0.0 true true 0 (GAF)] ] -36.7 MRshow -LT8 -0.50 0.00 0.50 C 1542 2464 M +LT5 +0.50 0.00 0.50 C 1278 2794 M 327 0 V 3049 352 M 18 69 V @@ -1296,8 +1117,8 @@ LT8 4313 3330 PentF 4501 3330 PentF 4690 3330 PentF -1705 2464 PentF -% End plot #9 +1441 2794 PentF +% End plot #6 1.000 UL LTb 539 3468 N diff --git a/F/SR.pdf b/F/SR.pdf index dbdc47b..8346082 100644 Binary files a/F/SR.pdf and b/F/SR.pdf differ diff --git a/F/T.eps b/F/T.eps index c4992ff..95ca9fd 100644 --- a/F/T.eps +++ b/F/T.eps @@ -2,7 +2,7 @@ %%BoundingBox: 53 53 545 402 %%HiResBoundingBox: 54 53.5 544.5 401.5 %%Creator: gnuplot 4.6 patchlevel 0 -%%CreationDate: Thu Sep 3 12:57:58 2015 +%%CreationDate: Thu Sep 3 17:52:29 2015 %%EndComments % EPSF created by ps2eps 1.68 %%BeginProlog @@ -513,7 +513,7 @@ SDict begin [ /Author (ali) % /Producer (gnuplot) % /Keywords () - /CreationDate (Thu Sep 3 12:57:58 2015) + /CreationDate (Thu Sep 3 17:52:29 2015) /DOCINFO pdfmark end } ifelse @@ -844,85 +844,39 @@ LT3 327 0 V 1029 786 M 847 594 V -847 719 V -847 346 V -847 304 V +847 58 V +847 238 V +847 129 V 1029 786 DiaF 1876 1380 DiaF -2723 2099 DiaF -3570 2445 DiaF -4417 2749 DiaF +2723 1438 DiaF +3570 1676 DiaF +4417 1805 DiaF 1731 3063 DiaF % End plot #4 % Begin plot #5 1.000 UP 2.000 UL LT4 -0.00 1.00 1.00 C LCb setrgbcolor +0.49 0.99 0.00 C LCb setrgbcolor 1502 2953 M -[ [(Helvetica) 110.0 0.0 true true 0 (TL-MuDiLCO-3)] +[ [(Helvetica) 110.0 0.0 true true 0 (old-MuDiLCO-7)] ] -36.7 MRshow LT4 -0.00 1.00 1.00 C 1568 2953 M -327 0 V -1029 552 M -847 224 V -847 297 V -847 80 V -847 178 V -1029 552 TriDF -1876 776 TriDF -2723 1073 TriDF -3570 1153 TriDF -4417 1331 TriDF -1731 2953 TriDF -% End plot #5 -% Begin plot #6 -1.000 UP -2.000 UL -LT5 -1.00 0.41 0.71 C LCb setrgbcolor -1502 2843 M -[ [(Helvetica) 110.0 0.0 true true 0 (TL-MuDiLCO-5)] -] -36.7 MRshow -LT5 -1.00 0.41 0.71 C 1568 2843 M -327 0 V -1029 683 M -847 360 V -847 363 V -847 18 V -847 146 V -1029 683 Circle -1876 1043 Circle -2723 1406 Circle -3570 1424 Circle -4417 1570 Circle -1731 2843 Circle -% End plot #6 -% Begin plot #7 -1.000 UP -2.000 UL -LT6 -0.49 0.99 0.00 C LCb setrgbcolor -1502 2733 M -[ [(Helvetica) 110.0 0.0 true true 0 (TL-MuDiLCO-7)] -] -36.7 MRshow -LT6 -0.49 0.99 0.00 C 1568 2733 M +0.49 0.99 0.00 C 1568 2953 M 327 0 V 1029 786 M 847 594 V -847 58 V -847 238 V -847 129 V +847 719 V +847 346 V +847 304 V 1029 786 Box 1876 1380 Box -2723 1438 Box -3570 1676 Box -4417 1805 Box -1731 2733 Box -% End plot #7 +2723 2099 Box +3570 2445 Box +4417 2749 Box +1731 2953 Box +% End plot #5 1.000 UL LTb 605 3468 N diff --git a/F/T.pdf b/F/T.pdf index 5fecff7..670968a 100644 Binary files a/F/T.pdf and b/F/T.pdf differ diff --git a/article.tex b/article.tex index fa3d153..0894ca4 100644 --- a/article.tex +++ b/article.tex @@ -1133,7 +1133,7 @@ $W_{U}$ & $|P|^2$ \\ \label{table3} % is used to refer this table in the text \end{table} - + \textcolor{green}{The MuDilLCO protocol is declined into four versions: MuDiLCO-1, MuDiLCO-3, MuDiLCO-5, and MuDiLCO-7, corresponding respectively to $T=1,3,5,7$ ($T$ the number of rounds in one sensing period). Since the time resolution may be prohibitif when the size of the problem increases, a time limit treshold has been fixed to solve large instances. In these cases, the solver returns the best solution found, which is not necessary the optimal solution. Table \ref{tl} shows time limit values. These time limit treshold have been set empirically. The basic idea consists in considering the average execution time to solve the integer programs to optimality, then by dividing this average time by three to set the threshold value. After that, this treshold value is increased if necessary such that the solver is able to deliver a feasible solution within the time limit. In fact, selecting the optimal values for the time limits will be investigated in future. In Table \ref{tl}, "NO" indicates that the problem has been solved to optimality without time limit. }. @@ -1151,9 +1151,9 @@ and MuDiLCO-7, corresponding respectively to $T=1,3,5,7$ ($T$ the number of \hline 150 & NO & NO & NO & 0.03 \\ \hline -200 & NO & 0.01 & 0.02 & 0.06 \\ +200 & NO & NO & NO & 0.06 \\ \hline - 250 & NO & 0.02 & 0.03 & 0.08 \\ + 250 & NO & NO & NO & 0.08 \\ \hline \end{tabular}