Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ deploy:
provider: heroku
api-key:
secure: $HEROKU_API_KEY
app: devteste
app: javatteixeira47
8 changes: 4 additions & 4 deletions src/main/java/com/example/Fibonacci.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
}
2 changes: 1 addition & 1 deletion src/main/java/com/example/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ String index() {

@RequestMapping("/fibo")
String fibo(Map<String, Object> model) {
ArrayList<Long> sequencia = new ArrayList<Long>();
ArrayList<Double> sequencia = new ArrayList<Double>();
for (int i = 0; i < 30; i++) {
sequencia.add(f.fibo(i));
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/fibo.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@


<div class="container">
<h1>Os 30 primeiros números de fibonacci são</h1>
<h1>Os 30 primeiros números binários são</h1>
<ul th:each="num : ${sequencia}">
<li th:text="${num}"/>
</ul>
Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
<img src="/lang-logo.png">
</a>
<h1>DevOps</h1>
<p>Este é um pequeno exemplo de de implementação</p>
<p>tteixeira47</p>

</div>
</div>
</div>
<div class="container">
<div class="alert alert-info text-center" role="alert">
Atenção! Siga as instruções abaixo para realizar o exercício.
Trabalho de Engenharia de Software
</div>
<hr>
<div class="row">
Expand Down
10 changes: 5 additions & 5 deletions src/test/java/TesteFibo.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}