diff --git a/+quantity/Domain.m b/+quantity/Domain.m index 74449b429b3f0fa9070d5ef85a3ca0129a24d336..1a7b1ef930b1461c0c9bc007b0c4b6c1e819773e 100644 --- a/+quantity/Domain.m +++ b/+quantity/Domain.m @@ -71,9 +71,7 @@ classdef (InferiorClasses = {?quantity.EquidistantDomain}) Domain < ... arguments obj (1, 1) quantity.Domain; end - %assert(numel(obj) == 1, 'only defined for scalar domains'); - %quan = quantity.Discrete(obj.grid, 'domain', obj, 'name', obj.name); - quan = quantity.Discrete(obj.grid, 'domain', obj, 'name', obj.name); + quan = quantity.Discrete(obj.grid, obj, 'name', obj.name); end % quantity.Discrete() function quan = Symbolic(obj) @@ -82,7 +80,7 @@ classdef (InferiorClasses = {?quantity.EquidistantDomain}) Domain < ... arguments obj (1, 1) quantity.Domain; end - quan = quantity.Symbolic(sym(obj.name), 'domain', obj, 'name', obj.name); + quan = quantity.Symbolic(sym(obj.name), obj, 'name', obj.name); end % Symbolic() end diff --git a/+unittests/+quantity/testDiscrete.m b/+unittests/+quantity/testDiscrete.m index e9370dd780ce3bfa8b2d0f95f47a89dd2ca6693c..92449b09efe7e3266e1c1f992d4aa840dc5afa93 100644 --- a/+unittests/+quantity/testDiscrete.m +++ b/+unittests/+quantity/testDiscrete.m @@ -1329,13 +1329,11 @@ a = quantity.Discrete(v, [Z, T]); b = quantity.Discrete(V, [Z, T]); % -verifyTrue(testCase, misc.alln(a.on() == b.on())); +verifyTrue(testCase, all(a.on() == b.on(), 'all')); %% -verifyTrue(testCase, all(b.on() == c.on(), 'all')); -verifyTrue(testCase, all(b.on() == d.on(), 'all')); +zeta = T.grid; [zGrid, zetaGrid] = ndgrid(z, zeta); - Z = quantity.Domain("z", z); Zeta = quantity.Domain("zeta", zeta); diff --git a/+unittests/+quantity/testDomain.m b/+unittests/+quantity/testDomain.m index 07def548d3183f036f5204b21e1c54b282d2d437..ebcbbc0ac794afa0c689afab4be5ec94332f62d2 100644 --- a/+unittests/+quantity/testDomain.m +++ b/+unittests/+quantity/testDomain.m @@ -18,6 +18,16 @@ tc.TestData.d = d; end +function testDiscrete(tc) +d = quantity.Domain("a", linspace(0, 1, 3)); +tc.verifyEqual(d.Discrete.on(), d.grid()); +end % testDiscrete + +function testSymbolic(tc) +d = quantity.Domain("a", linspace(0, 1, 3)); +tc.verifyEqual(d.Symbolic.on(), d.grid()); +end % testDiscrete + function testRename(tc) d = [quantity.Domain("a", linspace(0, 1, 3)), ... quantity.Domain("b", linspace(0, 2, 5)), ... @@ -27,10 +37,6 @@ xyz2 = d.rename(["z", "y", "x"], ["ab", "b", "a"]); tc.verifyEqual([xyz.name], ["x", "y", "z"]); tc.verifyEqual([xyz.name], [xyz2.name]); - - - - cba = d.rename(["c", "b", "a"], ["a", "b", "ab"]); tc.verifyEqual([cba.name], ["c", "b", "a"]); tc.verifyEqual([cba.n], [d.n]); diff --git a/+unittests/+quantity/testSymbolic.m b/+unittests/+quantity/testSymbolic.m index dc0332cec7a59652dce1682b3116a68f012c91e4..431a6866ae2b815deb121e02e9f13d02a4e53214 100644 --- a/+unittests/+quantity/testSymbolic.m +++ b/+unittests/+quantity/testSymbolic.m @@ -4,16 +4,6 @@ function [tests ] = testSymbolic() tests = functiontests(localfunctions()); end -function testSolveOde(tc) -% simple constant case -quan = quantity.Symbolic(0, quantity.Domain("z", linspace(0, 1, 3))); -solution = quan.solveOde(... - quantity.Domain('s', linspace(0, 1, 3)), ... - quantity.Domain('ic', linspace(0, 1, 3))); -[referenceResult1, referenceResult2] = ndgrid(linspace(0, 1, 3), linspace(0, 1, 3)); -tc.verifyEqual(solution.on(), referenceResult1 + referenceResult2, 'AbsTol', 10*eps); -end % testSolveDVariableEqualQuantity() - function testDet(tc) z = quantity.Domain("z", linspace(0, 1, 11)); zSymbolic = quantity.Symbolic(sym("z"), z);