Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Reimers, Dominik
fpinjava
Commits
39c17309
Commit
39c17309
authored
Mar 05, 2016
by
pysaumont
Browse files
Fixes after AC review for chapter 10
parent
7ab9918d
Changes
3
Hide whitespace changes
Inline
Side-by-side
fpinjava-parent/fpinjava-trees-exercises/src/test/java/com/fpinjava/trees/exercise10_05/TreeTest.java
View file @
39c17309
...
...
@@ -16,7 +16,7 @@ public class TreeTest {
@Test
public
void
testMin
()
throws
Exception
{
Tree
<
Integer
>
tree
=
Tree
.
tree
(
4
,
2
,
6
,
1
,
3
,
7
,
5
);
assertTrue
(
tree
.
m
ax
().
map
(
i
->
i
.
equals
(
1
)).
getOrElse
(
false
));
assertTrue
(
tree
.
m
in
().
map
(
i
->
i
.
equals
(
1
)).
getOrElse
(
false
));
}
@Test
...
...
@@ -28,6 +28,6 @@ public class TreeTest {
@Test
public
void
testMin2
()
throws
Exception
{
Tree
<
Integer
>
tree
=
Tree
.
tree
(
1
,
2
,
3
,
4
,
5
,
6
,
7
);
assertTrue
(
tree
.
m
ax
().
map
(
i
->
i
.
equals
(
1
)).
getOrElse
(
false
));
assertTrue
(
tree
.
m
in
().
map
(
i
->
i
.
equals
(
1
)).
getOrElse
(
false
));
}
}
fpinjava-parent/fpinjava-trees-solutions/src/main/java/com/fpinjava/trees/exercise10_02/Tree.java
View file @
39c17309
...
...
@@ -88,7 +88,7 @@ public abstract class Tree<A extends Comparable<A>> {
public
boolean
member
(
A
value
)
{
return
value
.
compareTo
(
this
.
value
)
<
0
?
left
.
member
(
value
)
:
value
.
compareTo
(
this
.
value
)
<
=
0
||
right
.
member
(
value
);
:
value
.
compareTo
(
this
.
value
)
=
=
0
||
right
.
member
(
value
);
}
@Override
...
...
fpinjava-parent/fpinjava-trees-solutions/src/main/java/com/fpinjava/trees/exercise10_14/Tree.java
View file @
39c17309
...
...
@@ -401,7 +401,7 @@ public abstract class Tree<A extends Comparable<A>> {
return
balance_
(
tree
.
toListInOrderRight
().
foldLeft
(
Tree
.<
A
>
empty
(),
t
->
a
->
new
T
<>(
empty
(),
a
,
t
)));
}
p
ublic
static
<
A
extends
Comparable
<
A
>>
Tree
<
A
>
balance_
(
Tree
<
A
>
tree
)
{
p
rivate
static
<
A
extends
Comparable
<
A
>>
Tree
<
A
>
balance_
(
Tree
<
A
>
tree
)
{
return
!
tree
.
isEmpty
()
&&
tree
.
height
()
>
log2nlz
(
tree
.
size
())
?
Math
.
abs
(
tree
.
left
().
height
()
-
tree
.
right
().
height
())
>
1
?
balance_
(
balanceFirstLevel
(
tree
))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment