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
30 changes: 15 additions & 15 deletions example/.metadata
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# This file should be version controlled and should not be manually edited.

version:
revision: "2f708eb8396e362e280fac22cf171c2cb467343c"
revision: "adc901062556672b4138e18a4dc62a4be8f4b3c2"
channel: "stable"

project_type: app
Expand All @@ -13,26 +13,26 @@ project_type: app
migration:
platforms:
- platform: root
create_revision: 2f708eb8396e362e280fac22cf171c2cb467343c
base_revision: 2f708eb8396e362e280fac22cf171c2cb467343c
create_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2
base_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2
- platform: android
create_revision: 2f708eb8396e362e280fac22cf171c2cb467343c
base_revision: 2f708eb8396e362e280fac22cf171c2cb467343c
create_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2
base_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2
- platform: ios
create_revision: 2f708eb8396e362e280fac22cf171c2cb467343c
base_revision: 2f708eb8396e362e280fac22cf171c2cb467343c
create_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2
base_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2
- platform: linux
create_revision: 2f708eb8396e362e280fac22cf171c2cb467343c
base_revision: 2f708eb8396e362e280fac22cf171c2cb467343c
create_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2
base_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2
- platform: macos
create_revision: 2f708eb8396e362e280fac22cf171c2cb467343c
base_revision: 2f708eb8396e362e280fac22cf171c2cb467343c
create_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2
base_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2
- platform: web
create_revision: 2f708eb8396e362e280fac22cf171c2cb467343c
base_revision: 2f708eb8396e362e280fac22cf171c2cb467343c
create_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2
base_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2
- platform: windows
create_revision: 2f708eb8396e362e280fac22cf171c2cb467343c
base_revision: 2f708eb8396e362e280fac22cf171c2cb467343c
create_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2
base_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2

# User provided section

Expand Down
16 changes: 16 additions & 0 deletions example/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,22 @@ packages:
description: flutter
source: sdk
version: "0.0.0"
intl:
dependency: transitive
description:
name: intl
sha256: "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5"
url: "https://pub.dev"
source: hosted
version: "0.20.2"
isolate_manager:
dependency: transitive
description:
name: isolate_manager
sha256: "375e35325c964be41336faeaf86641d742a944f10b28d301237b795f1085cbb7"
url: "https://pub.dev"
source: hosted
version: "6.1.2"
leak_tracker:
dependency: transitive
description:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import 'dart:math';
import 'dart:ui';
import 'package:flutter/foundation.dart';
import 'package:flutter_graph_view/core/algorithm/decorator/parallelizable_decorator.dart';
import 'package:flutter_graph_view/core/algorithm/decorator/parallelization_decorator.dart';
import 'package:flutter_graph_view/flutter_graph_view.dart';
import 'package:intl/intl.dart';
import 'package:isolate_manager/isolate_manager.dart';
Expand Down
6 changes: 4 additions & 2 deletions lib/core/algorithm/decorator/parallelization_decorator.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import 'package:flutter/foundation.dart';
import 'package:flutter_graph_view/core/algorithm/decorator/parallelizable_decorator.dart';
import 'package:flutter_graph_view/flutter_graph_view.dart';
import 'package:intl/intl.dart';
import 'package:isolate_manager/isolate_manager.dart';
Expand Down Expand Up @@ -147,8 +146,11 @@ class ParallelizationDecorator extends ForceDecorator {

// apply forces
var vMap = graph.vertexByIdMap;
var k = vMap.entries.firstOrNull?.key;
var keyParser = k is num ? num.parse : (v) => v;
totalForcePerVertex.forEach((key, force) {
setForceMap(vMap[key]!, vMap[key]!, force);
var v = vMap[keyParser(key)]!;
setForceMap(v, v, force);
});

// print how much time all parallel runs took
Expand Down
2 changes: 2 additions & 0 deletions lib/flutter_graph_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ export 'core/algorithm/decorator/graph_route_decorator.dart';
export 'core/algorithm/decorator/legend_decorator.dart';
export 'core/algorithm/decorator/counter_decorator.dart';
export 'core/algorithm/decorator/barnes_hut_coulomb_decorator.dart';
export 'core/algorithm/decorator/parallelizable_decorator.dart';
export 'core/algorithm/decorator/parallelization_decorator.dart';

export 'core/options/shape/vertex/vertex_circle_shape.dart';
export 'core/options/shape/vertex/vertex_diamond_shape.dart';
Expand Down
2 changes: 1 addition & 1 deletion lib/model/graph.dart
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,6 @@ class Graph<ID> {
/// serialize the graph
Map<String, dynamic> serialize() =>
{
"vertexes": { for (var v in vertexes) v.id as String: v.serialize() },
"vertexes": { for (var v in vertexes) '${v.id}': v.serialize() },
};
}
4 changes: 2 additions & 2 deletions lib/model/vertex.dart
Original file line number Diff line number Diff line change
Expand Up @@ -159,12 +159,12 @@ class Vertex<I> {

Map<String, dynamic> serialize() =>
{
"id": id as String,
"id": '$id',
"position": position,
"radius": radius,
"tag": tag,
"tags": tags,
"neighbors": neighbors.map((n) => n.id as String).toList(),
"neighbors": neighbors.map((n) => '${n.id}').toList(),
"degree": degree,
// TODO: how do we safely pass in properties
// "properties": properties
Expand Down