diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a914e7..94aafef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## 0.0.8 +- `xrange` dependency removed +- `ml_linalg 12.0.*` supported +- dart sdk constraint changed to `>=2.2.0 <3.0.0` + ## 0.0.7 - `xrange` version locked diff --git a/lib/src/data_frame/factories/from_matrix.dart b/lib/src/data_frame/factories/from_matrix.dart index 83d2b18..59742aa 100644 --- a/lib/src/data_frame/factories/from_matrix.dart +++ b/lib/src/data_frame/factories/from_matrix.dart @@ -4,7 +4,6 @@ import 'package:ml_dataframe/src/data_frame/data_frame_impl.dart'; import 'package:ml_dataframe/src/numerical_converter/numerical_converter_impl.dart'; import 'package:ml_linalg/linalg.dart'; import 'package:quiver/iterables.dart'; -import 'package:xrange/zrange.dart'; DataFrame fromMatrix(Matrix data, { Iterable predefinedHeader = const [], @@ -19,7 +18,7 @@ DataFrame fromMatrix(Matrix data, { autoHeaderPrefix, [], predefinedHeader); final selectedData = columns?.isNotEmpty == true - ? data.pick(columnRanges: columns.map((idx) => ZRange.singleton(idx))) + ? data.sample(columnIndices: columns) : data; final areSeriesDiscrete = enumerate(header).map((indexedName) { diff --git a/pubspec.lock b/pubspec.lock index ddcabbe..fddb607 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,7 +7,7 @@ packages: name: analyzer url: "https://pub.dartlang.org" source: hosted - version: "0.38.1" + version: "0.38.3" args: dependency: transitive description: @@ -42,7 +42,7 @@ packages: name: build url: "https://pub.dartlang.org" source: hosted - version: "1.1.6" + version: "1.2.0" build_cli_annotations: dependency: transitive description: @@ -63,28 +63,28 @@ packages: name: build_daemon url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.0" build_resolvers: dependency: transitive description: name: build_resolvers url: "https://pub.dartlang.org" source: hosted - version: "1.0.7" + version: "1.0.8" build_runner: dependency: "direct dev" description: name: build_runner url: "https://pub.dartlang.org" source: hosted - version: "1.6.7" + version: "1.7.1" build_runner_core: dependency: transitive description: name: build_runner_core url: "https://pub.dartlang.org" source: hosted - version: "3.0.9" + version: "4.1.0" build_test: dependency: "direct dev" description: @@ -105,7 +105,7 @@ packages: name: built_value url: "https://pub.dartlang.org" source: hosted - version: "6.7.0" + version: "6.7.1" charcode: dependency: transitive description: @@ -161,14 +161,14 @@ packages: name: coveralls url: "https://pub.dartlang.org" source: hosted - version: "5.4.0" + version: "5.5.0" crypto: dependency: transitive description: name: crypto url: "https://pub.dartlang.org" source: hosted - version: "2.1.2" + version: "2.1.3" csslib: dependency: transitive description: @@ -203,7 +203,7 @@ packages: name: front_end url: "https://pub.dartlang.org" source: hosted - version: "0.1.23" + version: "0.1.25" glob: dependency: transitive description: @@ -260,6 +260,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "3.1.3" + injector: + dependency: transitive + description: + name: injector + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.8" io: dependency: transitive description: @@ -287,7 +294,7 @@ packages: name: kernel url: "https://pub.dartlang.org" source: hosted - version: "0.3.23" + version: "0.3.25" lcov: dependency: transitive description: @@ -329,14 +336,14 @@ packages: name: ml_linalg url: "https://pub.dartlang.org" source: hosted - version: "11.0.0" + version: "12.0.2" ml_tech: dependency: "direct dev" description: name: ml_tech url: "https://pub.dartlang.org" source: hosted - version: "0.0.5" + version: "0.0.8" mockito: dependency: "direct dev" description: @@ -357,7 +364,7 @@ packages: name: node_preamble url: "https://pub.dartlang.org" source: hosted - version: "1.4.6" + version: "1.4.8" package_config: dependency: transitive description: @@ -511,7 +518,7 @@ packages: name: test url: "https://pub.dartlang.org" source: hosted - version: "1.6.8" + version: "1.6.10" test_api: dependency: transitive description: @@ -525,7 +532,7 @@ packages: name: test_core url: "https://pub.dartlang.org" source: hosted - version: "0.2.9" + version: "0.2.9+1" timing: dependency: transitive description: @@ -546,7 +553,7 @@ packages: name: vm_service url: "https://pub.dartlang.org" source: hosted - version: "1.1.1" + version: "2.0.0" vm_service_lib: dependency: transitive description: @@ -583,18 +590,18 @@ packages: source: hosted version: "3.5.0" xrange: - dependency: "direct main" + dependency: transitive description: name: xrange url: "https://pub.dartlang.org" source: hosted - version: "0.0.6" + version: "0.0.8" yaml: dependency: transitive description: name: yaml url: "https://pub.dartlang.org" source: hosted - version: "2.1.16" + version: "2.2.0" sdks: - dart: ">=2.4.0 <3.0.0" + dart: ">=2.5.0 <3.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index 3e63d06..a9ce708 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,17 +1,16 @@ name: ml_dataframe description: Dataframe - a way to store and manipulate data -version: 0.0.7 +version: 0.0.8 author: Ilia Gyrdymov homepage: https://github.com/gyrdym/ml_dataframe environment: - sdk: '>=2.4.0 <3.0.0' + sdk: '>=2.2.0 <3.0.0' dependencies: csv: ^4.0.0 - ml_linalg: ^11.0.0 + ml_linalg: ^12.0.2 quiver: ^2.0.2 - xrange: 0.0.6 dev_dependencies: benchmark_harness: '>=1.0.0 <2.0.0'