From e26fc7de086cc577d72ab7b8a2a6eb91deaef27d Mon Sep 17 00:00:00 2001 From: carloseir <64387887+carloseir@users.noreply.github.com> Date: Wed, 23 Sep 2020 18:10:04 -0600 Subject: [PATCH 1/5] carlos commit --- FIBONACCI.txt | 124 ++++++++++++++++++++++++++++++++++++++++ Makefile | 14 +++++ Sequences.c | 155 ++++++++------------------------------------------ fibo.out | Bin 0 -> 19176 bytes files.c | 133 +++++++------------------------------------ files.h | 4 -- main.c | 38 +++++++++++++ 7 files changed, 220 insertions(+), 248 deletions(-) create mode 100644 FIBONACCI.txt create mode 100644 Makefile create mode 100644 fibo.out create mode 100644 main.c diff --git a/FIBONACCI.txt b/FIBONACCI.txt new file mode 100644 index 0000000..737558c --- /dev/null +++ b/FIBONACCI.txt @@ -0,0 +1,124 @@ +nan 0.000000 nan 0.000000 +0.000000 0.000000 -nan -nan +-nan nan -nan -nan +-nan -nan 0.000000 -nan +-nan nan nan 0.000000 +0.000000 nan nan -nan +-nan 0.000000 nan 0.000000 +0.000000 nan nan -nan +-nan -nan -nan -nan +-nan 0.000000 0.000000 0.000000 +0.000000 -nan nan nan +nan 0.000000 -nan 0.000000 +0.000000 nan 0.000000 0.000000 +0.000000 0.000000 nan -nan +-nan -nan nan 0.000000 +0.000000 -nan nan -nan +-nan 0.000000 nan nan +nan nan 0.000000 nan +nan 0.000000 0.000000 -nan +-nan -nan nan -nan +-nan -nan nan 0.000000 +0.000000 -nan 0.000000 nan +nan 0.000000 nan 0.000000 +0.000000 -nan 0.000000 24.000000 +24.000000 452572026218753208844167144505637852943351061397257105077256453941045440125732158362390419452647815896575356914988496831423875763173658276032064928495888158934266945072721543400406981439504343937575212190700025842334521011542278991532949380635236230019915787706192923305457425311020377859717765818695603240597135054027204514527614342290479969106760014711714815786329843884784218930992584975008594539025905302147563125399181585876435388050627122760338974664716776832579049090307571225018283187956556342847532842813846796929957482104955834984571008885502626555485220283664337996408088978171032567174671536877114330153762295496290472513318734908478145193481792775659750687991913392596350634728190137707740043354138798627872205393665716875202777953915987620473375777249015885888683541925623369633268956336947743117133731745327205783607292528819884120535555866796858406307943277696836049651108487006418289285696696388593399697009889540032090771295971092802135811413608329240563865888293540450329903295727639816149831232202224137701693734402139058455502951760103926199393624807925591069048289051329635512828835082623777950234330247996939521627538399248221508283954885031759077451478559615916598542341427722045004105135372906505386222719424448439832212179139083905836744329544885207645078316551989240542682660186624500923903895977147074757184384444846323261240016326888669178080932217387698226378783373583514332298201757346679675721742253351888861374984153679872737292735907442933877626760244230453135960380093141066159556287518999594948429577309610018972878446929439328790724871775054361649445006345418819559536789979331662069302441639121051376578235752998428908766309156869362283239386639409799846604090652668572294150683518182359845957460443619754727611592303561453051817724782648571699355835126885216375614390432883373178133875049895463841429632074126575195617068116951894086637302063879828146883247486876099247531931994545389040465897991321408460364489213953623023903797844707502867549484632657208903348394529747730514916760415265132727309375205761517428757279186437010388961039044833284797069294145493459807585869444083888991883150052900923516707408109606346314651049576717107439532391378438325565704244813246639571180565166269611849197287948275647550625473208959822102567582518239616496870459649025980010138130134160096818578226057597608521055165122872182928463040347351942369891059066680919083967307888276318365343090518755687601448579753024005809991393619990575377878701845466805570223777039085866153737403312659763175579149187035839036894553056673150667895008311344002329086314134385072336068947775569430241913986978645358572101777159497648456145846525534395067832644430843203556616914081419571909243608045449488758182943292464479323365091074286383970854936087733744586449515400689787839147477392470260404934930982961142378485159405500290986793261479674687277866085536111866054124179117395821067531216185799519234449744192650266235139099018886715255342837680802676787838821123000845276842561487575848928707142610457022080452179103309513215427235771555818104566268678929962861325959612623978164053343284141440656074705464660630129761461667066603754225664.000000 0.000020 -nan +-nan nan -nan nan +nan nan nan nan +nan nan nan 0.000000 +0.000000 nan 0.000000 nan +nan nan 0.000000 nan +nan nan nan -nan +-nan -nan -nan -nan +-nan -nan -nan -nan +-nan -nan -nan -nan +-nan -nan -nan -nan +-nan -nan -nan nan +nan nan nan nan +nan nan nan nan +nan nan nan nan +nan nan nan nan +nan nan nan nan +nan nan nan nan +nan 0.000000 -nan 3488803814779835714253063262064496857247810870822702038882467476458739080378839031647307618214035672167625345295100829878490218774613169421168419431860427861510407098544113393688881780011599400941588547039365985349279128748796605525630426402255093080516826084569044038120376475235090200237078841107232704654540411117364706824008152330666743969342159672223243313536711620108765295530963017002997679841317439329255903931385693134145558380236424288790523164797918812138664654617867841664079324367186858761472112058459320520190358134280892664543517995852588076316663395932799330078067414144065745775617313948499043491529351312236485687886683872448288755411003671278051814054790266640106160601444176694428649961735303147647238842163395694246743347699580753765291135010112415771868547433609798338677732024667739967016888601051679741493440911445979410437269765886462798968433199048019638295249111203170674425854757494443804016808648535484094313110550982004828664900546649107750895828084460725696601119874284815608320247254399998270489212382448033702205400911626197279284222893648653633161343185877190797899197130466652766827948585820486510175919513501420270807834623398080156103734371211257616758090721624471058077347650791994577414992381380515994926371125754249247420890376877828899433595504328405978597928187136709689195779921743318943485873887159892221919050736042388221413169122669206732000283242204244454528408570576309552616179796186452601175956231621144540966268283459381052127722173977351451477835823033563601995460836185081661200790076442834145812275344141241660696501029806130302665245589661708773949839366840371880476585504163825583738724667312629006974375167734296782763121190064358746425345899131538401571565437711583683396118879950021936754251445944467047604235928415556231020334309454848355437250151612719090248642812766158694951526373698819415588083486221679169957455359149285091055457210266644603203629390144410128506399344598770611853989253939953926599439734173649079872491844784361941780044092722509579129999377705911142634636733792834000128913081015686780404139923769290019992592716218109973245793540366874624723516161596603845952915033334713653258107512634942245746811405333551338743654894143120620391128943880358892721862673906960280219012560332180488445360772495740267751559785695663814675896929232212320878576984191185990491195256042037837256967395075197803926824985928117400516750785658547933173347497613017893777043231723364514720934737840508747426437392839169740320255306029994856015209723833182538034099201089635179476656538817758361316119950675911593321311966907200416587959457836807658342141371763098783038365949322566518005651565902737882390026120807338777098971066368001426436143879061708548253370209861595938487453313077716531099497081695317451092762814161560513879309604792575234541627265795628869625709098525461196101391046990840930624230830476387958621776176649014622671948783832806994654766890240679946857321272755613441557194097841563632803711704713026599581491581516209005617762574189609101716866758699631319156828791711547003862723478787339995444723890972994176646733369933348232884196133177424210116860922265473648686083314656468952202266216073211394459697810065208080608876009458671456295818513187086307457934136178907580163682917805294813831701631692332129533831596483353584972083791572446358754429507055087601132872401649351603999861938381305055272823325572550750792642340805626809218544798701677886523092783461376367565098153729995712770802513664399320194078136934010535255862813140982997306427186389062049852654831706365608047884518747186927826255184227443096637683451932447690379181373428359068514770233653177876972962218777912347087518599722564975829771846882561317958251880907804897458279313726276574955058373514247000199697009800014255996199049973640791999647400244337750558935438201344225612214957955566397982948797068230955070031726557748770839995741981929644888958392713880579457590824310875096441446680641729387858130078847704906325589937274356207713556481109411095023217529784112434135633837255711644811592963259637998820400199278300432508340989428672244816335128947615361961703769838381713889822641776307133054321135467343183737595560303810578235570809106546700786693209055914224180927997841908531051871610779536494400344356736824453478804093655287152987370103136535524957989880080477109620642361869858308767026094538752.000000 +3488803814779835714253063262064496857247810870822702038882467476458739080378839031647307618214035672167625345295100829878490218774613169421168419431860427861510407098544113393688881780011599400941588547039365985349279128748796605525630426402255093080516826084569044038120376475235090200237078841107232704654540411117364706824008152330666743969342159672223243313536711620108765295530963017002997679841317439329255903931385693134145558380236424288790523164797918812138664654617867841664079324367186858761472112058459320520190358134280892664543517995852588076316663395932799330078067414144065745775617313948499043491529351312236485687886683872448288755411003671278051814054790266640106160601444176694428649961735303147647238842163395694246743347699580753765291135010112415771868547433609798338677732024667739967016888601051679741493440911445979410437269765886462798968433199048019638295249111203170674425854757494443804016808648535484094313110550982004828664900546649107750895828084460725696601119874284815608320247254399998270489212382448033702205400911626197279284222893648653633161343185877190797899197130466652766827948585820486510175919513501420270807834623398080156103734371211257616758090721624471058077347650791994577414992381380515994926371125754249247420890376877828899433595504328405978597928187136709689195779921743318943485873887159892221919050736042388221413169122669206732000283242204244454528408570576309552616179796186452601175956231621144540966268283459381052127722173977351451477835823033563601995460836185081661200790076442834145812275344141241660696501029806130302665245589661708773949839366840371880476585504163825583738724667312629006974375167734296782763121190064358746425345899131538401571565437711583683396118879950021936754251445944467047604235928415556231020334309454848355437250151612719090248642812766158694951526373698819415588083486221679169957455359149285091055457210266644603203629390144410128506399344598770611853989253939953926599439734173649079872491844784361941780044092722509579129999377705911142634636733792834000128913081015686780404139923769290019992592716218109973245793540366874624723516161596603845952915033334713653258107512634942245746811405333551338743654894143120620391128943880358892721862673906960280219012560332180488445360772495740267751559785695663814675896929232212320878576984191185990491195256042037837256967395075197803926824985928117400516750785658547933173347497613017893777043231723364514720934737840508747426437392839169740320255306029994856015209723833182538034099201089635179476656538817758361316119950675911593321311966907200416587959457836807658342141371763098783038365949322566518005651565902737882390026120807338777098971066368001426436143879061708548253370209861595938487453313077716531099497081695317451092762814161560513879309604792575234541627265795628869625709098525461196101391046990840930624230830476387958621776176649014622671948783832806994654766890240679946857321272755613441557194097841563632803711704713026599581491581516209005617762574189609101716866758699631319156828791711547003862723478787339995444723890972994176646733369933348232884196133177424210116860922265473648686083314656468952202266216073211394459697810065208080608876009458671456295818513187086307457934136178907580163682917805294813831701631692332129533831596483353584972083791572446358754429507055087601132872401649351603999861938381305055272823325572550750792642340805626809218544798701677886523092783461376367565098153729995712770802513664399320194078136934010535255862813140982997306427186389062049852654831706365608047884518747186927826255184227443096637683451932447690379181373428359068514770233653177876972962218777912347087518599722564975829771846882561317958251880907804897458279313726276574955058373514247000199697009800014255996199049973640791999647400244337750558935438201344225612214957955566397982948797068230955070031726557748770839995741981929644888958392713880579457590824310875096441446680641729387858130078847704906325589937274356207713556481109411095023217529784112434135633837255711644811592963259637998820400199278300432508340989428672244816335128947615361961703769838381713889822641776307133054321135467343183737595560303810578235570809106546700786693209055914224180927997841908531051871610779536494400344356736824453478804093655287152987370103136535524957989880080477109620642361869858308767026094538752.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0.000000 +0.000000 0.000000 0.000000 0 \ No newline at end of file diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..f254c03 --- /dev/null +++ b/Makefile @@ -0,0 +1,14 @@ +fibo.out: main.c Sequences.c files.c + gcc -g -o fibo.out main.c Sequences.c files.c + +main.o: main.c + gcc -g -c main.c + +Sequences.o: Sequences.c + gcc -g -c Sequences.c + +files.o: files.c + gcc -g -c files.c + +clean: + rm *.o diff --git a/Sequences.c b/Sequences.c index 4ef9c72..ae7e2ae 100644 --- a/Sequences.c +++ b/Sequences.c @@ -1,137 +1,30 @@ -<<<<<<< HEAD -// -// Sequences.c -// -// -// Created by Cesar Angeles on 07/09/2020. -// - #include -#include - -#define Sequences_IMPORT #include "Sequences.h" - - -long long int Sequences_sfibo(long long int n){ - long long int sequence_1 = 0, sequence_2 = 1, temp = 0; - int index = 0; - - for (index = 0; index < n; index ++){ - - temp = sequence_2; - sequence_2 = sequence_2 + sequence_1; - sequence_1 = temp; - - } - (n<=0) ? sequence_2 = 0 : (sequence_2 = sequence_1); - - return sequence_2; - -} - - - -long long int Sequences_rfibo(long long int n){ - - if (n == 1){ - return 1; - } - if(n > 1){ - return Sequences_rfibo(n - 1) + Sequences_rfibo(n - 2); - }else{ - return 0; - } - -} -||||||| f46ea0f -======= -// -// Sequences.h -// -// -// Created by Cesar Angeles on 07/09/2020. -// - -#ifndef Sequences_h -#define Sequences_h - -#include - -#ifdef Sequences_IMPORT - #define EXTERN -#else - #define EXTERN extern -#endif - - -/* Sequences.h -- Function prototypes */ - -/** - * Returns the value of the fibonacci sequence at index n calculated sequentially - * @param - * n (long long int): - * Index of the fibonacci sequence - * @return long long int value -*/ - -/*long long int Sequences_sfibo(long long int n) { - int prev_number = 0, next_number = 1; - n = prev_number; - prev_number = next_number; - next_number = next_number + n; - return n; -}*/ - -long long int Sequences_sfibo(long long int n){ - long long int prev_number = 0, next_number = 1, fibonacci_number = 0; - int index = 0; - - for (index = 0; index < n; index ++){ - fibonacci_number = prev_number; - prev_number = next_number; - next_number = next_number + fibonacci_number; - return fibonacci_number; - } - +long long int Sequences_sfibo(long long int n) +{ + long long int t1 = 0, t2 = 1, sig; + int i; + + for (i = 1; i <= n; ++i) + { + sig = t1 + t2; + t1 = t2; + t2 = sig; + } + return sig; } - -/** - * Returns the value of the fibonacci sequence at index n calculated recursively - * @param - * n (long long int): - * Index of the fibonacci sequence - * @return long long int value -*/ - -/*long long int Sequences_rfibo(long long int n) { - if(n == 0) { - return 0; - } - else if(n == 1) { - return 1; - } - else { - return(recursive_fib(n - 1) + recursive_fib(n - 2)); - } -}*/ - -long long int Sequences_rfibo(long long int number){ - if (number == 0){ - return 0; - } - else if(number == 1){ - return 1; - } - else{ - return Sequences_rfibo(number - 1) + Sequences_rfibo(number - 2); - } +long long int Sequences_rfibo(long long int n) +{ + if (n>2) + return Sequences_rfibo(n-1) + Sequences_rfibo(n-2); + else if (n==2) + return 1; + else if (n==1) + return 1; + else if (n==0) + return 0; + else + return -1; } - - -#undef Sequences_IMPORT -#undef EXTERN -#endif /* Sequences_h */ ->>>>>>> e94102e9b652f269c770d77c8267559b161b52fd diff --git a/fibo.out b/fibo.out new file mode 100644 index 0000000000000000000000000000000000000000..3246e4ad7255bb97e5f0b66316f382095466890f GIT binary patch literal 19176 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 - -#define files_IMPORT #include "files.h" - - - -FILE * file_new(char *name, char *mode){ - FILE * my_file = NULL; - - my_file = fopen(name, mode); - - if (my_file == NULL){ - puts("FILE OPEN ERROR"); - return NULL; - }else - return my_file; -} - - -void file_num_write(FILE * file,size_t columns, long double buff[][columns], size_t rows){ - size_t row, column = 0; - - for(row = 0; row < rows; row ++){ - for(column = 0; column < columns; column ++){ - fprintf(file, "%Lf\t", buff[row][column]); - } - fprintf(file, "\n"); +FILE * file_new(char *name, char *mode) +{ + FILE *fp = NULL; + fp = fopen(name, mode); + if (fp == NULL){ + puts("FILE OPEN ERROR"); + return NULL; } + else + return fp; } -||||||| f46ea0f -======= -// -// files.h -// -// -// Created by Cesar Angeles on 07/09/2020. -// - -#ifndef files_h -#define files_h - -#include - -#ifdef files_IMPORT - #define EXTERN -#else - #define EXTERN extern -#endif - -/* files.h -- Function prototypes */ - -/** - * Instanciates a new file pointer identified via its name and mode. - * @param - * name (char *): - * Name of the file - * mode (char *): - * Mode of file to be opened {r, rb, a, ab, w, wb} - * - * @return FILE * opened_file. -*/ - -FILE * file_new(char *name, char *mode){ - FILE * my_file = NULL; - - my_file = fopen(name, mode); - - if (my_file == NULL){ - puts("FILE OPEN ERROR"); - return NULL; - } - else - return my_file; -} - - - -/** - * Writes a bidimensional buffer array into a file. - * @param - * file (FILE *): - * Storage file - * columns (size_t ): - * length of the buffer array - * buff [ ][columns] (long double): - * RAM matrix - * rows (size_t): - * width of the storage buffer - * - * @return void. -*/ - -void file_num_write(FILE * file, size_t columns, long double buff[][columns], size_t rows) { - size_t row, column; - - for(row = 0; row < rows; row ++){ - for(column = 0; column < columns; column ++){ - fprintf(file, "%Lf\t", buff[row][column]); - } - fprintf(file, "\n"); +void file_num_write(FILE * file, size_t columns, long double buff[] [columns], size_t rows) +{ + size_t i, j; + for(i = 0; i <= rows; i++) + { + for(j = 0; j <= columns; j++) + { + fprintf(file, "%Lf \t", buff[i][j]); } + fprintf(file,"\n"); + } + return; } - -#undef files_IMPORT -#undef EXTERN - - - -#endif /* files_h */ ->>>>>>> e94102e9b652f269c770d77c8267559b161b52fd diff --git a/files.h b/files.h index 254089b..7ddc38b 100644 --- a/files.h +++ b/files.h @@ -56,7 +56,3 @@ EXTERN void file_num_write(FILE * file, size_t columns, long double buff[] [colu #endif /* files_h */ - - -/*ietartivos en milisegundos -recursivos en segundos*/ \ No newline at end of file diff --git a/main.c b/main.c new file mode 100644 index 0000000..0f8522e --- /dev/null +++ b/main.c @@ -0,0 +1,38 @@ +#include +#include + +#include "files.h" +#include "Sequences.h" + +int main(void) +{ + int n = 24, i; + FILE * new; + long double buffer[n][3]; + double cpu_time = 0; + clock_t start, stop; + new = file_new("FIBONACCI.txt", "w"); + + for(i = 1; i<=n; i++) + { + start = clock(); + Sequences_rfibo(n); + stop = clock(); + cpu_time = ((double)(stop-start))/CLOCKS_PER_SEC / 100; + buffer[n][0] = n; + buffer[n][1] = cpu_time; + printf("Recursiva: %f\n", cpu_time); + + start = clock(); + Sequences_sfibo(n); + stop = clock(); + cpu_time = ((double)(stop-start))/CLOCKS_PER_SEC / 100; + buffer[n][0] = n; + buffer[n][2] = cpu_time*1000; + printf("Secuencial: %f\n", cpu_time*1000); + } + + file_num_write(new, 3, buffer, n); + fclose(new); + +} From d290fb57282b53ae6283bd70111e3999887f6a3d Mon Sep 17 00:00:00 2001 From: carloseir <64387887+carloseir@users.noreply.github.com> Date: Wed, 23 Sep 2020 18:33:24 -0600 Subject: [PATCH 2/5] Update makefile --- makefile | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/makefile b/makefile index 1fabd67..40834b0 100644 --- a/makefile +++ b/makefile @@ -1,13 +1,14 @@ -CC = gcc -CFLAGS = -I -Wall -DEPS = Sequences.h files.h time_test_fibo.h -OBJ = time_test_fibo.o Sequences.o files.o +fibo.out: main.c Sequences.c files.c + gcc -g -o fibo.out main.c Sequences.c files.c -%.o : %.c $(DEPS) - $(CC) -c -o $@ $< $(CFLAGS) +main.o: main.c + gcc -g -c main.c -time_test_fibo: $(OBJ) - $(CC) -o $@ $^ $(CFLAGS) +Sequences.o: Sequences.c + gcc -g -c Sequences.c + +files.o: files.c + gcc -g -c files.c clean: rm *.o From 04a59554de6b05c124a8e682604b46a342fca096 Mon Sep 17 00:00:00 2001 From: carloseir <64387887+carloseir@users.noreply.github.com> Date: Wed, 23 Sep 2020 18:40:10 -0600 Subject: [PATCH 3/5] deleted accidentally cloned files --- FIBO_TIME.dat | 61 ------------------------------------------------- time_test | Bin 13160 -> 0 bytes time_test_fibo | Bin 12920 -> 0 bytes 3 files changed, 61 deletions(-) delete mode 100644 FIBO_TIME.dat delete mode 100755 time_test delete mode 100755 time_test_fibo diff --git a/FIBO_TIME.dat b/FIBO_TIME.dat deleted file mode 100644 index 647702c..0000000 --- a/FIBO_TIME.dat +++ /dev/null @@ -1,61 +0,0 @@ -<<<<<<< HEAD -0.000000 0.000000 0.000010 -1.000000 0.000000 0.000000 -2.000000 0.000000 0.000000 -3.000000 0.000000 0.000010 -4.000000 0.000000 0.000020 -5.000000 0.000000 0.000020 -6.000000 0.000000 0.000020 -7.000000 0.000000 0.000030 -8.000000 0.000000 0.000020 -9.000000 0.000000 0.000020 -10.000000 0.000000 0.000030 -11.000000 0.000001 0.000040 -12.000000 0.000001 0.000050 -13.000000 0.000002 0.000040 -14.000000 0.000003 0.000040 -15.000000 0.000005 0.000040 -16.000000 0.000008 0.000060 -17.000000 0.000013 0.000050 -18.000000 0.000020 0.000050 -19.000000 0.000032 0.000050 -20.000000 0.000052 0.000060 -21.000000 0.000082 0.000060 -22.000000 0.000130 0.000060 -23.000000 0.000211 0.000050 -24.000000 0.000341 0.000060 -25.000000 0.000569 0.000060 -||||||| f46ea0f -======= -0.000000 0.000000 0.000000 -1.000000 0.000000 0.000000 -2.000000 0.000000 0.000000 -3.000000 0.000000 0.000000 -4.000000 0.000000 0.000000 -5.000000 0.000000 0.000000 -6.000000 0.000000 0.000000 -7.000000 0.000000 0.000000 -8.000000 0.000000 0.000000 -9.000000 0.000000 0.000000 -10.000000 0.000000 0.000000 -11.000000 0.000000 0.000000 -12.000000 0.000000 0.000000 -13.000000 0.000000 0.000000 -14.000000 0.000000 0.000000 -15.000000 0.000000 0.000000 -16.000000 0.000000 0.000000 -17.000000 0.000000 0.000000 -18.000000 0.000156 0.000000 -19.000000 0.000000 0.000000 -20.000000 0.000156 0.000000 -21.000000 0.000313 0.000000 -22.000000 0.000313 0.000000 -23.000000 0.000625 0.000000 -24.000000 0.000937 0.000000 -25.000000 0.001563 0.000000 -26.000000 0.002344 0.000000 -27.000000 0.003750 0.000000 -28.000000 0.006250 0.000000 -29.000000 0.009687 0.000000 -30.000000 0.015938 0.000000 ->>>>>>> e94102e9b652f269c770d77c8267559b161b52fd diff --git a/time_test b/time_test deleted file mode 100755 index d6508125d2111ccfd65ddce2419eee9173304eb5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13160 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 KSx`}@{(k|}l1+{P From 26335e83e83a15de0d59a97d239375afcf554b68 Mon Sep 17 00:00:00 2001 From: carloseir <64387887+carloseir@users.noreply.github.com> Date: Wed, 23 Sep 2020 23:59:22 -0600 Subject: [PATCH 4/5] delete accidentaly cloned files 2 --- time_test_fibo.h | 52 ------------------------------------------------ 1 file changed, 52 deletions(-) delete mode 100644 time_test_fibo.h diff --git a/time_test_fibo.h b/time_test_fibo.h deleted file mode 100644 index 42699e6..0000000 --- a/time_test_fibo.h +++ /dev/null @@ -1,52 +0,0 @@ -<<<<<<< HEAD -// -// time_test_fibo.h -// -// -// Created by Cesar Angeles on 07/09/2020. -// - -#ifndef time_test_fibo_h -#define time_test_fibo_h - -#include -#include "files.h" - -#define STATISTIC 100.0 -#define OBSERVATIONS 26 -#define VALUES 3 - -typedef enum{ - INDEX, - RECURSIVE, - ITERATIVE -}TYPE; - -#endif /* time_test_fibo_h */ -||||||| f46ea0f -======= -// -// time_test_fibo.h -// -// -// Created by Cesar Angeles on 07/09/2020. -// - -#ifndef time_test_fibo_h -#define time_test_fibo_h - -#include -#include "files.h" - -#define STATISTIC 100.0 -#define OBSERVATIONS 31 -#define VALUES 3 - -typedef enum{ - INDEX, - RECURSIVE, - ITERATIVE -}TYPE; - -#endif /* time_test_fibo_h */ ->>>>>>> e94102e9b652f269c770d77c8267559b161b52fd From 6ec15ae55497791ea29ff4191be917a853ede98c Mon Sep 17 00:00:00 2001 From: carloseir <64387887+carloseir@users.noreply.github.com> Date: Thu, 24 Sep 2020 00:01:21 -0600 Subject: [PATCH 5/5] delete accidentaly cloned files 3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Estos errores se deben a que cloné el repositorio del profesor ya que la master branch había avanzado, debido a que eliminé mi primer clon por inexperiencia en git. --- time_test_fibo.c | 130 ----------------------------------------------- 1 file changed, 130 deletions(-) delete mode 100644 time_test_fibo.c diff --git a/time_test_fibo.c b/time_test_fibo.c deleted file mode 100644 index 75c202b..0000000 --- a/time_test_fibo.c +++ /dev/null @@ -1,130 +0,0 @@ -<<<<<<< HEAD -// -// time_test_fibo.c -// -// -// Created by Cesar Angeles on 07/09/2020. -// - - - -#include -#include - - - -#include "Sequences.h" -#include "files.h" -#include "time_test_fibo.h" - -int main(void){ - - long long int value = 0; - int index = 0; - clock_t start, stop; - double cpu_time = 0; - double mean = 0; - FILE * record = NULL; - long double buffer[OBSERVATIONS][VALUES] = {0}; - size_t obs = 0; - - record = file_new("FIBO_TIME.dat","w"); - - //puts("Enter n fibo value:"); - //scanf("%lld", &value); - - printf("%lld\t", value); - - for (obs = 0; obs < OBSERVATIONS; obs ++){ - printf("%zu\n",obs); - - - start = clock(); - for (index = 0; index <= STATISTIC; index ++){ - Sequences_rfibo(obs); - } - stop = clock(); - - cpu_time = ((double)(stop-start)) /CLOCKS_PER_SEC / STATISTIC; - buffer[obs][INDEX] = obs; - buffer[obs][RECURSIVE] = cpu_time; - printf("Recursive Fibo time %f s\t", cpu_time); - - start = clock(); - for (index = 0; index <= STATISTIC; index ++){ - Sequences_sfibo(obs); - } - stop = clock(); - - cpu_time = ((double)(stop-start)) /CLOCKS_PER_SEC / STATISTIC; - buffer[obs][ITERATIVE] = cpu_time*1e3; - printf("Sequential Fibo time %f ms\n", cpu_time*1e3); - } - - file_num_write(record, VALUES, buffer, OBSERVATIONS); - fclose(record); - -} -||||||| f46ea0f -======= -// -// time_test_fibo.c -// -// -// Created by Cesar Angeles on 07/09/2020. -// - - - -#include -#include - - - -#include "Sequences.h" -#include "files.h" -#include "time_test_fibo.h" - -int main(void){ - - long long int value = 0; - int index = 0; - clock_t start, stop; - double cpu_time = 0; - double mean = 0; - FILE * record = NULL; - long double buffer[OBSERVATIONS][VALUES] = {0}; - size_t obs = 0; - - record = file_new("FIBO_TIME.dat","w"); - - for(obs = 0; obs < OBSERVATIONS; obs ++) { - printf("%zu\n", obs); - - start = clock(); - for (index = 0; index <= STATISTIC; index ++){ - Sequences_rfibo(obs); - } - stop = clock(); - - cpu_time = ((double)(stop-start)) /CLOCKS_PER_SEC / STATISTIC; - buffer[obs][INDEX] = obs; - buffer[obs][RECURSIVE] = cpu_time; - printf("Recursive Fibo time %f s\t", cpu_time); - - start = clock(); - for (index = 0; index <= STATISTIC; index ++){ - Sequences_sfibo(obs); - } - stop = clock(); - - cpu_time = ((double)(stop-start)) /CLOCKS_PER_SEC / STATISTIC; - buffer[obs][ITERATIVE] = cpu_time*1e3; - printf("Sequential Fibo time %f ms\n", cpu_time*1e3); - } - - file_num_write(record, VALUES, buffer, OBSERVATIONS); - fclose(record); - -} ->>>>>>> e94102e9b652f269c770d77c8267559b161b52fd