From 19fd9552c882c3d5ef2bbb2a5194631f0785fa62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Gonz=C3=A1lez?= Date: Sun, 7 Sep 2025 14:04:42 +0200 Subject: [PATCH] after dart --fix --- README.md | 11 +++++------ lib/corpus.dart | 4 ++-- lib/formula_models.dart | 4 +--- test/formula_models_test.dart | 1 - 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index f595f98..00d6931 100644 --- a/README.md +++ b/README.md @@ -33,15 +33,14 @@ The file is a dart array of formulas. Each formula is a dart set literal }, { - "name": 'Test argument order', + "name": 'Triangle rectangle', "input": [ - 'z':{ "magnitude": 'scalar'}, - 'a':{ "magnitude": 'scalar'}, - 'y':{ "magnitude": 'scalar'}, + 'b':{ "magnitude": 'meter'}, + 'c':{ "magnitude": 'meter'}, ], - "output": { 'result', "magnitude": 'scalar' }, + "output": { 'a': { "magnitude": 'meter' } }, "d4rtCode": ''' - result = a * 100 + y * 10 + z; + a = Math.sqrt(b*b + c*c); ''', } ] diff --git a/lib/corpus.dart b/lib/corpus.dart index 0089404..2f76c7a 100644 --- a/lib/corpus.dart +++ b/lib/corpus.dart @@ -29,7 +29,7 @@ class UnitCorpus { void loadUnits(List units, [bool replaceOnDuplicates = false]) { for (final unit in units) { if (!replaceOnDuplicates && _allUnits.containsKey(unit.name)) { - throw ArgumentError("Duplicate unit:${unit}"); + throw ArgumentError("Duplicate unit:$unit"); } _allUnits[unit.name] = unit; _baseToUnits[unit.baseUnit]?.add(unit.name); @@ -38,7 +38,7 @@ class UnitCorpus { UnitSpec operator [](String unit) { if (!_allUnits.containsKey(unit)) { - throw ArgumentError("Unit not found:${unit}"); + throw ArgumentError("Unit not found:$unit"); } return _allUnits.get(unit); } diff --git a/lib/formula_models.dart b/lib/formula_models.dart index 4788486..b8a39b5 100644 --- a/lib/formula_models.dart +++ b/lib/formula_models.dart @@ -33,8 +33,6 @@ class UnitSpec { final String? codeFromUnitToBase; final String? codeFromBaseToUnit; - static final BASEUNIT="BASEUNIT"; - UnitSpec({ required this.name, required this.baseUnit, @@ -49,7 +47,7 @@ class UnitSpec { String symbol = SetUtils.stringValue(theSet, "symbol"); if( theSet.containsKey("isBase") ){ - return UnitSpec(name: name, baseUnit: BASEUNIT, symbol: symbol, factorFromUnitToBase: 1); + return UnitSpec(name: name, baseUnit: name, symbol: symbol, factorFromUnitToBase: 1); } String baseUnit = SetUtils.stringValue(theSet, "baseUnit"); diff --git a/test/formula_models_test.dart b/test/formula_models_test.dart index 77af9e5..52d6fea 100644 --- a/test/formula_models_test.dart +++ b/test/formula_models_test.dart @@ -1,6 +1,5 @@ import 'package:d4rt_formulas/corpus.dart'; import 'package:d4rt_formulas/formula_evaluator.dart'; -import 'package:flutter/services.dart'; import 'package:test/test.dart'; import 'package:d4rt_formulas/formula_models.dart'; import 'dart:convert' show utf8;