From be77f4b886c4c75b78324d79e6820217afec6d53 Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Fri, 1 Apr 2011 15:35:40 -0700 Subject: [PATCH] Moved into project specific dirs, started e2 with haskell --- Makefile | 4 ++-- e1.cs => e1/e1.cs | 0 e1.erl => e1/e1.erl | 0 e1.hs => e1/e1.hs | 0 e1.lisp => e1/e1.lisp | 0 e1.m => e1/e1.m | 0 e1.pl => e1/e1.pl | 0 e1.py => e1/e1.py | 0 e1.rb => e1/e1.rb | 0 e2/e2.hs | 6 ++++++ 10 files changed, 8 insertions(+), 2 deletions(-) rename e1.cs => e1/e1.cs (100%) rename e1.erl => e1/e1.erl (100%) rename e1.hs => e1/e1.hs (100%) rename e1.lisp => e1/e1.lisp (100%) rename e1.m => e1/e1.m (100%) rename e1.pl => e1/e1.pl (100%) rename e1.py => e1/e1.py (100%) rename e1.rb => e1/e1.rb (100%) create mode 100644 e2/e2.hs diff --git a/Makefile b/Makefile index c782583..669a5a1 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ default: - mcs *.cs + mcs */*.cs clean: - rm -r -f *.exe *.beam a.out + rm -r -f */*.exe */*.beam */a.out diff --git a/e1.cs b/e1/e1.cs similarity index 100% rename from e1.cs rename to e1/e1.cs diff --git a/e1.erl b/e1/e1.erl similarity index 100% rename from e1.erl rename to e1/e1.erl diff --git a/e1.hs b/e1/e1.hs similarity index 100% rename from e1.hs rename to e1/e1.hs diff --git a/e1.lisp b/e1/e1.lisp similarity index 100% rename from e1.lisp rename to e1/e1.lisp diff --git a/e1.m b/e1/e1.m similarity index 100% rename from e1.m rename to e1/e1.m diff --git a/e1.pl b/e1/e1.pl similarity index 100% rename from e1.pl rename to e1/e1.pl diff --git a/e1.py b/e1/e1.py similarity index 100% rename from e1.py rename to e1/e1.py diff --git a/e1.rb b/e1/e1.rb similarity index 100% rename from e1.rb rename to e1/e1.rb diff --git a/e2/e2.hs b/e2/e2.hs new file mode 100644 index 0000000..e6744e7 --- /dev/null +++ b/e2/e2.hs @@ -0,0 +1,6 @@ +fib_count last current max sum + | current >= max = sum + | rem current 2 == 0 = fib_count current (current + last) max (sum + current) + | otherwise = fib_count current (current + last) max sum + +e2 = fib_count 0 1 4000000 0