equipo 4 - practica memory testing Fibonacci

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

Sequences.c

@@ -1,137 +1,30 @@
-<<<<<<< HEAD
-//
-//  Sequences.c
-//  
-//
-//  Created by Cesar Angeles on 07/09/2020.
-//
-
 #include <stdio.h>
-#include <stdlib.h>
-
-#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 <stdio.h>
-
-#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

files.c

@@ -1,122 +1,29 @@
-<<<<<<< HEAD
-//
-//  files.c
-//  
-//
-//  Created by Cesar Angeles on 07/09/2020.
-//
-
 #include <stdio.h>
-
-#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 <stdio.h>
-
-#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

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*/