Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
2XB3FinalProject
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Contributor analytics
Repository analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Christopher Schankula
2XB3FinalProject
Commits
21491b20
Commit
21491b20
authored
7 years ago
by
Christopher Schankula
Browse files
Options
Downloads
Patches
Plain Diff
very first minimally working (for building) KD tree, search next
parent
d199a3aa
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/sandbox/Point.java
+29
-0
29 additions, 0 deletions
src/sandbox/Point.java
src/sort/KDT.java
+90
-0
90 additions, 0 deletions
src/sort/KDT.java
src/sort/MergeSort.java
+1
-1
1 addition, 1 deletion
src/sort/MergeSort.java
with
120 additions
and
1 deletion
src/sandbox/Point.java
0 → 100644
+
29
−
0
View file @
21491b20
package
sandbox
;
public
class
Point
implements
Comparable
<
Point
>
{
private
final
int
x
;
private
final
int
y
;
public
Point
(
int
x
,
int
y
)
{
this
.
x
=
x
;
this
.
y
=
y
;
}
public
int
getX
()
{
return
this
.
x
;
}
public
int
getY
()
{
return
this
.
y
;
}
public
String
toString
()
{
return
String
.
format
(
"(%d,%d)"
,
x
,
y
);
}
@Override
public
int
compareTo
(
Point
o
)
{
// TODO Auto-generated method stub
return
0
;
}
}
This diff is collapsed.
Click to expand it.
src/sort/KDT.java
0 → 100644
+
90
−
0
View file @
21491b20
package
sort
;
import
sandbox.Point
;
import
java.util.ArrayList
;
public
class
KDT
<
KeyVal
extends
Comparable
<
KeyVal
>>
{
Node
root
;
ArrayList
<
GeneralCompare
<
KeyVal
>>
axes
;
public
static
void
main
(
String
[]
args
)
{
GeneralCompare
<
Point
>
compX
=
(
p1
,
p2
)
->
((
Point
)
p1
).
getX
()
-
((
Point
)
p2
).
getX
();
GeneralCompare
<
Point
>
compY
=
(
p1
,
p2
)
->
((
Point
)
p1
).
getY
()
-
((
Point
)
p2
).
getY
();
//(2,3), (4,7), (5,4), (7,2), (8,1), (9,6)
//(8,1), (7,2), (2,3), (5,4), (9,6), (4,7)
Point
p1
=
new
Point
(
2
,
3
);
Point
p2
=
new
Point
(
5
,
4
);
Point
p3
=
new
Point
(
9
,
6
);
Point
p4
=
new
Point
(
4
,
7
);
Point
p5
=
new
Point
(
8
,
1
);
Point
p6
=
new
Point
(
7
,
2
);
ArrayList
<
GeneralCompare
<
Point
>>
axes
=
new
ArrayList
<
GeneralCompare
<
Point
>>();
axes
.
add
(
compX
);
axes
.
add
(
compY
);
Point
[]
pts
=
{
p1
,
p2
,
p3
,
p4
,
p5
,
p6
};
KDT
<
Point
>
kdt
=
new
KDT
(
axes
,
pts
);
System
.
out
.
println
(
kdt
.
size
());
System
.
out
.
println
(
kdt
.
height
());
}
private
class
Node
{
private
KeyVal
keyval
;
private
Node
left
,
right
;
private
int
n
;
public
Node
(
KeyVal
keyval
,
int
n
)
{
this
.
keyval
=
keyval
;
this
.
n
=
n
;
}
}
public
KDT
(
ArrayList
<
GeneralCompare
<
KeyVal
>>
axes
,
Comparable
<
KeyVal
>[]
keyvals
)
{
this
.
axes
=
axes
;
root
=
buildTree
(
keyvals
,
0
,
keyvals
.
length
-
1
,
0
);
}
private
Node
buildTree
(
Comparable
<
KeyVal
>[]
keyvals
,
int
lo
,
int
hi
,
int
depth
)
{
if
(
lo
>
hi
)
return
null
;
int
axis
=
depth
%
getK
();
int
mid
=
(
lo
+
hi
)
/
2
;
MergeSort
.
sort
(
keyvals
,
lo
,
hi
,
axes
.
get
(
axis
));
KeyVal
median
=
(
KeyVal
)
keyvals
[
mid
];
System
.
out
.
println
(
median
);
//TODO: fix size
Node
newNode
=
new
Node
(
median
,
0
);
newNode
.
left
=
buildTree
(
keyvals
,
lo
,
mid
-
1
,
depth
+
1
);
newNode
.
right
=
buildTree
(
keyvals
,
mid
+
1
,
hi
,
depth
+
1
);
newNode
.
n
=
size
(
newNode
.
left
)
+
size
(
newNode
.
right
)
+
1
;
return
newNode
;
}
public
int
size
()
{
return
size
(
root
);
}
public
int
height
()
{
return
height
(
root
);
}
private
int
height
(
Node
x
)
{
if
(
x
==
null
)
return
0
;
return
1
+
Math
.
max
(
height
(
x
.
left
),
height
(
x
.
right
));
}
private
int
size
(
Node
x
)
{
if
(
x
==
null
)
return
0
;
else
return
x
.
n
;
}
public
int
getK
()
{
return
axes
.
size
();
}
}
This diff is collapsed.
Click to expand it.
src/sort/MergeSort.java
+
1
−
1
View file @
21491b20
...
...
@@ -37,7 +37,7 @@ public class MergeSort{
int
mid
=
lo
+
(
n
/
2
);
// Fill auxiliary array
System
.
out
.
println
(
"lo, mid, hi: "
+
lo
+
", "
+
mid
+
", "
+
hi
);
//
System.out.println("lo, mid, hi: " + lo + ", " + mid + ", " + hi);
for
(
int
k
=
lo
;
k
<=
hi
;
k
++){
aux
[
k
]
=
x
[
k
];
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment