diff --git a/.travis.yml b/.travis.yml index e478a3da9..6c91a9331 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,4 +4,4 @@ deploy: provider: heroku api-key: secure: $HEROKU_API_KEY - app: devteste \ No newline at end of file + app: javatteixeira47 \ No newline at end of file diff --git a/src/main/java/com/example/Fibonacci.java b/src/main/java/com/example/Fibonacci.java index 96dbb4b8f..cd925519e 100644 --- a/src/main/java/com/example/Fibonacci.java +++ b/src/main/java/com/example/Fibonacci.java @@ -5,11 +5,11 @@ public class Fibonacci{ public Fibonacci(){ } - public static long fibo(int n) { - if (n < 2) { - return n; + public static double fibo(int n) { + if (n >= 0) { + return Math.pow(2,n); } else { - return fibo(n - 1) + fibo(n - 2); + return -1; } } } \ No newline at end of file diff --git a/src/main/java/com/example/Main.java b/src/main/java/com/example/Main.java index bc9d9de2c..0613db3f2 100644 --- a/src/main/java/com/example/Main.java +++ b/src/main/java/com/example/Main.java @@ -46,7 +46,7 @@ String index() { @RequestMapping("/fibo") String fibo(Map model) { - ArrayList sequencia = new ArrayList(); + ArrayList sequencia = new ArrayList(); for (int i = 0; i < 30; i++) { sequencia.add(f.fibo(i)); } diff --git a/src/main/resources/templates/fibo.html b/src/main/resources/templates/fibo.html index c2ef2170e..2224acab6 100644 --- a/src/main/resources/templates/fibo.html +++ b/src/main/resources/templates/fibo.html @@ -5,7 +5,7 @@
-

Os 30 primeiros números de fibonacci são

+

Os 30 primeiros números binários são

diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 38af68707..8ff928e1d 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -9,13 +9,13 @@

DevOps

-

Este é um pequeno exemplo de de implementação

+

tteixeira47

-
+

diff --git a/src/test/java/TesteFibo.java b/src/test/java/TesteFibo.java index df9d604df..3623076e5 100644 --- a/src/test/java/TesteFibo.java +++ b/src/test/java/TesteFibo.java @@ -7,26 +7,26 @@ public class TesteFibo { @Test public void Teste1() { Fibonacci f = new Fibonacci(); - assertEquals(1L, f.fibo(1)); + assertEquals(2D, f.fibo(1), 0.01); } @Test public void Teste2() { Fibonacci f = new Fibonacci(); - assertEquals(2L, f.fibo(3)); + assertEquals(8D, f.fibo(3), 0.01); } @Test public void Teste3() { Fibonacci f = new Fibonacci(); - assertEquals(34L, f.fibo(9)); + assertEquals(512D, f.fibo(9), 0.01); } @Test public void Teste4() { Fibonacci f = new Fibonacci(); - assertEquals(233L, f.fibo(13)); + assertEquals(4D, f.fibo(2), 0.01); } @Test public void Teste5() { Fibonacci f = new Fibonacci(); - assertEquals(514229L, f.fibo(29)); + assertEquals(16D, f.fibo(4), 0.01); } } \ No newline at end of file