Commit 862f313abda0e0f8cd8d43f376703809244ca29c

Authored by Tamkpanka Tamtare
1 parent c12a5b3b
Exists in master

resolution de la fusion tr_sort.m

Showing 1 changed file with 0 additions and 10 deletions   Show diff stats
tr_sort.m
... ... @@ -21,22 +21,12 @@ function tr_sort(num_spot,mission,debut,h1,fin,h2)
21 21 % Enregistrements sous forme de structure sur Brandypot:
22 22 % sas/usagers/share_lasso/data/MEOPAR/drifter
23 23  
24   -<<<<<<< HEAD
25 24 %rootdir = '/sas/usagers/share_lasso/data/MEOPAR';
26 25 rootdir = '/share/archives/partage_lasso/spot';
27 26  
28 27 fid1 = fopen([ rootdir '/spots_pos_flag_clean.csv']);
29 28 header = textscan(fid1,'%s;%s;%s;%s;%s;%s',1);
30 29 spot_clean = textscan(fid1,'%f %f %f %f %s %s','Delimiter',';');
31   -=======
32   -rootdir = '/sas/usagers/share_lasso/data/MEOPAR';
33   -rootdir = '/share/archives/partage_lasso/spot';
34   -
35   -datafile = 'spots_pos_flag_clean.csv';
36   -
37   -fid1 = fopen([rootdir,'/',datafile]);
38   -spot_clean = textscan(fid1,'%f %f %f %f %s', 'delimiter',';');
39   ->>>>>>> 34a1af0f18cd70ac52566c710fb2c8abde1cb78e
40 30 fclose(fid1);
41 31  
42 32 spot = spot_clean{1,1};
... ...