From fea108eff568eda8dd12d2b1b04121c290288abc Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Tue, 30 Nov 2010 13:25:02 +0100 Subject: [PATCH] modified makefile for conways game of life --- Makefile | 3 +++ bin/5_p_c_fibonacci | Bin 11603 -> 10429 bytes src/5_p_c_fibonacci.c | 23 ++++++++--------------- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index c5f051a..dfd2175 100644 --- a/Makefile +++ b/Makefile @@ -6,6 +6,9 @@ VPATH = src/ all: $(PROGS) +conway: src/conway.c + $(CC) $(CFLAGS) -std=gnu99 src/conway.c -o bin/conway -lcurses + %: src/%.c $(CC) $(CFLAGS) $< -o bin/$@ diff --git a/bin/5_p_c_fibonacci b/bin/5_p_c_fibonacci index 11d1638753aefc1dc187f26f8f4cbed0b06872d2..1a676c0b1175e9161a070d26ade214e1991b535b 100755 GIT binary patch delta 2721 zcmZWreQZ-z6hHU9w(q?byMAozV_Ua&-^{UAMA(2q)irc7KZp|LOFMMB8XP*dNfh0* ziKdxE=Gh-4k~lR{iQgizgh==h24W1LQN%?DA*K^ZBq1gku%7$geKO-|-aYsH&d0s? z-1E-scdNc!zE$@nZ86|vjsOo7k2JjF990bvM%9tiO&Un1XNIOlWzfuq8Z#n4- zLB8gD8Vf37G~;qN4>C2GC#w0H%X~Le#|`-am-#`b_L0mDIo))zJ#*s0MCNQFeeREY z?rR_4mvqD+F~0vvgB6dr*<+CVm^?0T-O4wU7`C^&u*+WS?WTaxzidy;odiPHxp2F^ zsB}R%CWxs=s{ej zRBCT4A?Vmrvt7Xf>Qh?*6A#$6tc$}vOad*qarVw{1~7y;tA z+r5M(@QS-4oE5g>MSw9OiQ7z0` z$;?YbFFjW5)l|0@NvcvubBU=foJqgfYXwRezYQx%Ch zZljr9AqFc4Q6D zAFFZuU9!8>?PWgZq4JQb!R1;^5M@P7>EdnXlrqx9mdudd3tS6b?SAePb1*;E{#=k% z6O^c?6f7vxm#X&vfZBD}x*5}*orc12zpkLo(gx|a8}aTU9X~57jsR$qbqgiO)UcYC z78I`hsDEIjYj11xLv>GdkJR9o6kz-o=3uE_g|7vCrTsk{Q;+p@Jra7jyR+AydDW6i0qpVdot z&Yt-?Giv@w$s{Yo9ioMrAWt9B*|8Fjl5}2jrLm4G4`BQ)Lm< z%RKmAS=4L2k7Gis<5U@~A$+m|P2j9xM6=ofU}tc?R~PT4ZZlVm;f`R$Ykeb=0zHLO z!HBb&`YI=CAeH6wya^#D6a$5uF;yP%S|3O2qqzuolt(?nG%HLec21QKG8V;DD5B|} zq!B>JH$(GrTPTWZSZDPZ4liN%VrO`XmKLAGxkftng+tCS1ac?C-^24Xo6p?Br)It? zL)tEZBn@PUkRqx{PM@1WDnrhr0*O+P%6Zb2LaeM>tZl0>?Nm%v&DX|iO(}>ws@`B( zWYtBo1ESR90!F7Rl2sVO5t7CTE0Ud%HMonuBl}67LA~)3X_H*)a8vGLX25Bq3&aDUxWX{(CP`X&b0QvWJNKUyCt;opBwqEaDFEyhO38AB|J88H7$d-6#yXes^&(3G1_!>`5NL5x4m|LGt&eb? u5~~%xDBJ=DPPMS}Qp58MUuaxoGuqHZ<09WfU5|A3b(+2Bp;S+*5B>o{W*dC~ delta 4163 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 diff --git a/src/5_p_c_fibonacci.c b/src/5_p_c_fibonacci.c index dd18379..7a6f838 100644 --- a/src/5_p_c_fibonacci.c +++ b/src/5_p_c_fibonacci.c @@ -3,6 +3,7 @@ /* declarations */ int sum(int n); +int sum2(int n); int fib(int n); int main() { @@ -10,7 +11,7 @@ int main() { printf("Please enter n: "); scanf("%d", &n); - printf("fib(%d) = %d\nsum(%d) = %d\n", n, fib(n), n, sum(n)); + printf("fib(%d) = %d\nsum(%d) = %d\n", n, fib(n), n, sum2(n)); return 0; } @@ -25,19 +26,11 @@ int sum(int n) { return sum; } -int fib(int n) { - if (n >= 2) { - return fib(n-1) + fib(n-1); - } - else if (n == 1) { - return 1; - } - else if (n == 0) { - return 0; - } - else { - fprintf(stderr, "Invalid parameter: %d", n); - exit(-1); - } +int sum2(int n) { + return (n > 1) ? sum2(n-1) + n : 1; +} + +int fib(int n) { + return (n < 2) ? n : fib(n-1) + fib(n-2); }