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

BREAKING: Migrate away from parts and only export the files we intend consumers to use #65

Merged
merged 19 commits into from
Nov 20, 2023
Merged
Changes from 7 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
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
9 changes: 5 additions & 4 deletions analysis_options.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
linter:
rules:
- cancel_subscriptions
- close_sinks
include: package:workiva_analysis_options/v2.recommended.yaml
analyzer:
strong-mode:
implicit-casts: false
implicit-dynamic: true
104 changes: 59 additions & 45 deletions benchmark/benchmarks.dart
Original file line number Diff line number Diff line change
@@ -4,11 +4,11 @@ import 'package:benchmark_harness/benchmark_harness.dart';

import 'package:r_tree/r_tree.dart';

final int branchFactor = 16;
final int randomSeed = 3;
main() {
const int branchFactor = 16;
const int randomSeed = 3;
void main() {
print('Running benchmarks...');
var collector = ScoreCollector();
final collector = ScoreCollector();
InsertBenchmark(collector, totalItems: 100).report();
InsertBenchmark(collector, totalItems: 1000).report();
InsertBenchmark(collector, totalItems: 10000).report();
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As of now there's still a difference between doing add with one item vs many items, so we can probably keep the benchmarks around until we change that in a future PR.

@@ -27,19 +27,19 @@ main() {
SearchBenchmark(collector, totalItems: 1000, iterateAll: true, useLoad: true).report();
SearchBenchmark(collector, totalItems: 10000, iterateAll: true, useLoad: true).report();

var longestName =
final longestName =
collector.collected.keys.reduce((value, element) => value.length > element.length ? value : element).length;
var longestValue = collector.collected.values
final longestValue = collector.collected.values
.reduce((value, element) => value.toStringAsFixed(2).length > element.toStringAsFixed(2).length ? value : element)
.toStringAsFixed(2);
var nameHeading = 'Name';
var heading = '$nameHeading${' ' * (longestName - nameHeading.length)}\tResult (microseconds)';
var separator = '-' * (heading.length + 5);
const nameHeading = 'Name';
final heading = '$nameHeading${' ' * (longestName - nameHeading.length)}\tResult (microseconds)';
final separator = '-' * (heading.length + 5);
var output = '\n$heading\n$separator\n';
collector.collected.forEach((String name, double value) {
name += (' ' * (longestName - name.length));
var valueString = value.toStringAsFixed(2);
output += '$name\t${' ' * (longestValue.length - valueString.length)}${valueString}\n';
collector.collected.forEach((name, value) {
name += ' ' * (longestName - name.length);
final valueString = value.toStringAsFixed(2);
output += '$name\t${' ' * (longestValue.length - valueString.length)}$valueString\n';
});

print(output);
@@ -48,95 +48,104 @@ main() {
class InsertBenchmark extends RTreeBenchmarkBase {
final int totalItems;

InsertBenchmark(ScoreCollector collector, {this.totalItems = 500}) : super("Insert $totalItems", collector);
InsertBenchmark(ScoreCollector collector, {this.totalItems = 500}) : super('Insert $totalItems', collector);

late RTree<String> tree;
late List<RTreeDatum<String>> datum;

@override
void run() {
tree = RTree<String>(branchFactor);
for (var data in datum) {
for (final data in datum) {
tree.add([data]);
}
}

@override
void setup() {
Random rand = Random(randomSeed);
final rand = Random(randomSeed);
datum = <RTreeDatum<String>>[];
for (int i = 0; i < totalItems; i++) {
int x = rand.nextInt(1000);
int y = rand.nextInt(1000);
int height = rand.nextInt(100);
int width = rand.nextInt(100);
for (var i = 0; i < totalItems; i++) {
final x = rand.nextInt(1000);
final y = rand.nextInt(1000);
final height = rand.nextInt(100);
final width = rand.nextInt(100);
final item = RTreeDatum<String>(Rectangle(x, y, width, height), 'item $i');
datum.add(item);
}
}

@override
void teardown() {}
}

class LoadBenchmark extends RTreeBenchmarkBase {
final int totalItems;

LoadBenchmark(ScoreCollector collector, {required this.totalItems}) : super("Load $totalItems ", collector);
LoadBenchmark(ScoreCollector collector, {required this.totalItems}) : super('Load $totalItems ', collector);

late RTree<String> tree;
late List<RTreeDatum<String>> datum;

@override
void run() {
tree = RTree<String>(branchFactor);
tree.add(datum);
}

@override
void setup() {
Random rand = Random(randomSeed);
final rand = Random(randomSeed);
datum = <RTreeDatum<String>>[];
for (int i = 0; i < totalItems; i++) {
int x = rand.nextInt(1000);
int y = rand.nextInt(1000);
int height = rand.nextInt(100);
int width = rand.nextInt(100);
for (var i = 0; i < totalItems; i++) {
final x = rand.nextInt(1000);
final y = rand.nextInt(1000);
final height = rand.nextInt(100);
final width = rand.nextInt(100);
final item = RTreeDatum<String>(Rectangle(x, y, width, height), 'item $i');
datum.add(item);
}
datum.shuffle();
}

@override
void teardown() {}
}

class RemoveBenchmark extends RTreeBenchmarkBase {
RemoveBenchmark(ScoreCollector collector) : super("Remove 5k", collector);
RemoveBenchmark(ScoreCollector collector) : super('Remove 5k', collector);

late RTree<String> tree;
final items = <List<RTreeDatum<String>>>[];

@override
void run() {
for (int i = 0; i < 100; i++) {
for (int j = 0; j < 50; j++) {
for (var i = 0; i < 100; i++) {
for (var j = 0; j < 50; j++) {
tree.remove(items[i][j]);
}
}
}

@override
void setup() {
tree = RTree<String>(branchFactor);

for (int i = 0; i < 100; i++) {
for (int j = 0; j < 100; j++) {
for (var i = 0; i < 100; i++) {
for (var j = 0; j < 100; j++) {
if (items.length <= i) {
items.add([]);
}

Rectangle rect = Rectangle(i, j, 1, 1);
final rect = Rectangle(i, j, 1, 1);
final datum = RTreeDatum<String>(rect, 'item $i:$j');
items[i].add(datum);
tree.add([datum]);
}
}
}

@override
void teardown() {}
}

@@ -154,34 +163,36 @@ class SearchBenchmark extends RTreeBenchmarkBase {
required this.totalItems,
this.iterateAll = false,
this.useLoad = false,
}) : super("Search${iterateAll ? '/Iterate' : ''} ${useLoad ? '(using Load)' : '(using Insert)'} ${totalItems}",
}) : super("Search${iterateAll ? '/Iterate' : ''} ${useLoad ? '(using Load)' : '(using Insert)'} $totalItems",
collector);

late RTree<String> tree;
late int size;

@override
void run() {
for (int x = 0; x < size; x++) {
for (int y = 0; y < size; y++) {
var results = tree.search(Rectangle(x, y, 1, 1));
for (var x = 0; x < size; x++) {
for (var y = 0; y < size; y++) {
final results = tree.search(Rectangle(x, y, 1, 1));
if (iterateAll) {
// ignore: unused_local_variable
for (var result in results) {
for (final result in results) {
// nothing to do here, just iterating over every result once
}
}
}
}
}

@override
void setup() {
size = sqrt(totalItems).ceil();
tree = RTree(branchFactor);

var datum = <RTreeDatum<String>>[];
for (int i = 0; i < 10; i++) {
for (int j = 0; j < 50; j++) {
Rectangle rect = Rectangle(i, j, 1, 1);
final datum = <RTreeDatum<String>>[];
for (var i = 0; i < 10; i++) {
for (var j = 0; j < 50; j++) {
final rect = Rectangle(i, j, 1, 1);
datum.add(RTreeDatum<String>(rect, 'item1'));
datum.add(RTreeDatum<String>(rect, 'item2'));
datum.add(RTreeDatum<String>(rect, 'item3'));
@@ -198,10 +209,13 @@ class SearchBenchmark extends RTreeBenchmarkBase {
if (useLoad) {
tree.add(datum);
} else {
datum.forEach((item) => tree.add([item]));
for (final item in datum) {
tree.add([item]);
}
}
}

@override
void teardown() {}
}

@@ -212,7 +226,7 @@ class RTreeBenchmarkBase extends BenchmarkBase {

@override
void exercise() {
for (int i = 0; i < iterations; i++) {
for (var i = 0; i < iterations; i++) {
run();
}
}
2 changes: 1 addition & 1 deletion benchmark/web_benchmarks.dart
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@ import 'dart:html';

import 'benchmarks.dart' as benchmarks;

main() {
void main() {
final button = querySelector('#runButton')! as ButtonElement;
button.onClick.listen((_) async {
button.disabled = true;
Loading