From 09422247fe86c55961ffd53587fe0ea8772e452c Mon Sep 17 00:00:00 2001 From: Santo Cariotti Date: Sat, 27 May 2017 15:32:20 +0200 Subject: added travis --- .travis.yml | 2 +- Makefile | 6 +++++ cpp/Makefile | 6 ----- cpp/checksum.cpp | 8 ------- cpp/lswf.cpp | 73 -------------------------------------------------------- lswf.cpp | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 80 insertions(+), 88 deletions(-) create mode 100644 Makefile delete mode 100644 cpp/Makefile delete mode 100644 cpp/checksum.cpp delete mode 100644 cpp/lswf.cpp create mode 100644 lswf.cpp diff --git a/.travis.yml b/.travis.yml index bbba71c..d3e104c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,4 +9,4 @@ install: - sudo apt-get install -qq g++-4.8 - export CXX="g++-4.8" -script: $(CXX) -std=c++11 -o cpp/somme cpp/somme.cpp +script: make lswf diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..74db46d --- /dev/null +++ b/Makefile @@ -0,0 +1,6 @@ +CC=g++ +CFLAGS=-o +CVERSION=c++11 + +$1: $1.cpp + $(CC) -Wall -std=$(CVERSION) $(CFLAGS) cpp/$1 cpp/$1.cpp diff --git a/cpp/Makefile b/cpp/Makefile deleted file mode 100644 index ad5e8f5..0000000 --- a/cpp/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -CC=g++ -CFLAGS=-o -CVERSION=c++11 - -$1: $1.cpp - $(CC) -Wall -std=$(CVERSION) $(CFLAGS) $1 $1.cpp diff --git a/cpp/checksum.cpp b/cpp/checksum.cpp deleted file mode 100644 index e80398f..0000000 --- a/cpp/checksum.cpp +++ /dev/null @@ -1,8 +0,0 @@ -#include -#include - -int main() -{ - - return 0; -} diff --git a/cpp/lswf.cpp b/cpp/lswf.cpp deleted file mode 100644 index dcf1b13..0000000 --- a/cpp/lswf.cpp +++ /dev/null @@ -1,73 +0,0 @@ -/* INPUT: - * 19 - * - * OUTPUT: - * 1000101 - */ -#include -#include -#include -#define MAXG 1000001 - -int fibonacci(int* fib, int N) -{ - fib[0] = 1; fib[1] = 1; - int lst; - - for(int i = 2; i < N; i++) { - fib[i] = fib[i-1] + fib[i-2]; - lst = i; - if(fib[i] > N) break; - } - - return lst; -} - -int main() -{ - std::ifstream in("input.txt"); - std::ofstream out("output.txt"); - std::list seq; - std::list::iterator j; - - int N, i; - in >> N; - int caracts[MAXG], somma = 0, potSomma; - int lastc; - - if(N > 4) - lastc = fibonacci(caracts, N); - else { - caracts[0] = 1; - for(i = 1; i < 4; i++) - caracts[i] = i; - - switch (N) { - case 1: - lastc = 1; - break; - case 2: - lastc = 2; - break; - case 3: - lastc = 3; - break; - default: - lastc = 4; - } - } - - for(i = lastc; i > 0; i--) { - potSomma = somma + caracts[i]; - if(potSomma < N) { - somma = potSomma; - seq.push_front(1); - } else seq.push_front(0); - } - seq.push_front(1); - for(j = seq.begin(); j != seq.end(); j++) out << *j; - - in.close(); - out.close(); - return 0; -} diff --git a/lswf.cpp b/lswf.cpp new file mode 100644 index 0000000..dcf1b13 --- /dev/null +++ b/lswf.cpp @@ -0,0 +1,73 @@ +/* INPUT: + * 19 + * + * OUTPUT: + * 1000101 + */ +#include +#include +#include +#define MAXG 1000001 + +int fibonacci(int* fib, int N) +{ + fib[0] = 1; fib[1] = 1; + int lst; + + for(int i = 2; i < N; i++) { + fib[i] = fib[i-1] + fib[i-2]; + lst = i; + if(fib[i] > N) break; + } + + return lst; +} + +int main() +{ + std::ifstream in("input.txt"); + std::ofstream out("output.txt"); + std::list seq; + std::list::iterator j; + + int N, i; + in >> N; + int caracts[MAXG], somma = 0, potSomma; + int lastc; + + if(N > 4) + lastc = fibonacci(caracts, N); + else { + caracts[0] = 1; + for(i = 1; i < 4; i++) + caracts[i] = i; + + switch (N) { + case 1: + lastc = 1; + break; + case 2: + lastc = 2; + break; + case 3: + lastc = 3; + break; + default: + lastc = 4; + } + } + + for(i = lastc; i > 0; i--) { + potSomma = somma + caracts[i]; + if(potSomma < N) { + somma = potSomma; + seq.push_front(1); + } else seq.push_front(0); + } + seq.push_front(1); + for(j = seq.begin(); j != seq.end(); j++) out << *j; + + in.close(); + out.close(); + return 0; +} -- cgit v1.2.3-18-g5258