Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Indexes 2.0.0 #3

Merged
merged 5 commits into from
Jul 25, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Update
  • Loading branch information
tzaeschke committed Jul 24, 2023
commit 3b2bdf00857243792c1767f27ae7015e07790e00
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## 2023-07-24

- (TZ) Version bumbed to 1.1.0
- (TZ) tinspin-indexes 2.0.0
- (TZ) Changed data type of indexes from Singleton Object (or sometimes double[]) to Integer ID.

## 2023-07-04

- (TZ) Added support for multimap tests
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>ch.ethz.globis.tinspin</groupId>
<artifactId>TinSpin</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.1.0-SNAPSHOT</version>

<name>TinSpin</name>
<description>The TinSpin framework for benchmarking in-memory spatial indexes</description>
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/ch/ethz/globis/tinspin/wrappers/PointSTRZ.java
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,12 @@ public PointSTRZ(TestStats ts) {
phc = RTree.createRStar(dims);
}

@SuppressWarnings({"unchecked", "rawtype"})
@SuppressWarnings("unchecked")
@Override
public void load(double[] data, int dims) {
int pos = 0;
Entry<Integer>[] list = new Entry[N];
@SuppressWarnings("rawtype")
Entry<Integer>[] list = (Entry<Integer>[]) new Entry[N];
for (int n = 0; n < N; n++) {
double[] lo = new double[dims];
double[] hi = new double[dims];
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/tinspin/wrappers/PointCTZ.java
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public void load(double[] data, int dims) {
//double[][] allData = new double[N][dims];
//ArrayList<Point<double[]>> list = new ArrayList<>(N);

PointEntry<Integer>[] points = new PointEntry[N];
PointEntry<Integer>[] points = (PointEntry<Integer>[]) new PointEntry[N];
for (int i = 0; i < N; i++) {
double[] p = new double[dims];
System.arraycopy(data, pos, p, 0, dims);
Expand Down