Commit d085a88a authored by Jakob Gabriel's avatar Jakob Gabriel
Browse files

bugfix of previous merge-faults

parent f1f2099b
......@@ -1412,6 +1412,7 @@ classdef (InferiorClasses = {?quantity.Symbolic}) Discrete ...
for it = 1 : numel(obj)
newObj(it).valueDiscrete = obj(it).on(newDomain);
end
end % changeGrid()
function newObj = replaceGrid(obj, myNewDomain, optArgs)
......
......@@ -1313,8 +1313,8 @@ T = quantity.Domain('t', t);
d = quantity.Discrete(V, 'domain', [Z, T]);
%%
verifyTrue(testCase, misc.alln(b.on() == c.on()));
verifyTrue(testCase, misc.alln(b.on() == d.on()));
verifyTrue(testCase, all(b.on() == c.on(), 'all'));
verifyTrue(testCase, all(b.on() == d.on(), 'all'));
end
......@@ -1368,7 +1368,7 @@ Z = quantity.Domain('z', linspace(0,1,100));
T = quantity.Domain('t', linspace(0,1,42));
V = quantity.Discrete( quantity.Discrete.value2cell(v, [100, 42], [2, 3]), ...
'domain', [Z, T]);
verifyTrue(testCase, misc.alln(v == V.on()));
verifyTrue(testCase, all(v == V.on(), 'all'));
end
function testMtimesDifferentGrid(testCase)
......
......@@ -446,7 +446,7 @@ function testZero(testCase)
x = quantity.Symbolic(0, 'domain', quantity.Domain.empty());
verifyEqual(testCase, x.on(), 0);
verifyTrue(testCase, misc.alln(on(x) * magic(5) == zeros(5)));
verifyTrue(testCase, all(on(x) * magic(5) == zeros(5), 'all'));
end
......@@ -470,7 +470,7 @@ d = [quantity.Domain('z', linspace(0, 1, 5)), ...
x = quantity.Symbolic(sin(z * t * pi), 'domain', d);
o = x / x;
verifyTrue(testCase, misc.alln(o.on == 1));
verifyTrue(testCase, all(o.on() == 1, 'all'));
% test constant values
invsin = 1 / ( x + 8);
......@@ -595,7 +595,7 @@ b = quantity.Symbolic(v, 'grid', {z, t}, 'gridName', {'x', 'y'});
c = quantity.Symbolic(v, 'grid', {z, t}, 'gridName', {'x', 'y'});
%%
verifyTrue(testCase, misc.alln(b.on() == c.on()));
verifyTrue(testCase, all(b.on() == c.on(), 'all'));
end
function testPlus(testCase)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment