From a622b8788be405189a9c6e4dc68d1c7cc551e389 Mon Sep 17 00:00:00 2001
From: Ferdinand Fischer <ferdinand.fischer@fau.de>
Date: Fri, 7 Feb 2020 14:19:36 +0100
Subject: [PATCH] unittests are now also working for Operator and BasicVariable

---
 +quantity/Discrete.m                | 4 ++--
 +unittests/+quantity/testOperator.m | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/+quantity/Discrete.m b/+quantity/Discrete.m
index 8b4708f..e52cf4c 100644
--- a/+quantity/Discrete.m
+++ b/+quantity/Discrete.m
@@ -98,8 +98,8 @@ classdef  (InferiorClasses = {?quantity.Symbolic}) Discrete < handle & matlab.mi
 				% the case if all values are empty. This is required for
 				% the initialization of quantity.Function and
 				% quantity.Symbolic objects
-				assert( numGridElements(myDomain) == numel(valueOriginal{1}) || ...
-					misc.alln( cellfun(@isempty, valueOriginal ) ), ...
+				assert( misc.alln( cellfun(@isempty, valueOriginal ) ) || ...
+					numGridElements(myDomain) == numel(valueOriginal{1}), ...
 					'grids do not fit to valueOriginal');				
 				
 				% allow initialization of empty objects
diff --git a/+unittests/+quantity/testOperator.m b/+unittests/+quantity/testOperator.m
index 8e853d2..5ada30c 100644
--- a/+unittests/+quantity/testOperator.m
+++ b/+unittests/+quantity/testOperator.m
@@ -27,7 +27,7 @@ A = cat(3, [ 0, 0, 0, 0; ...
 B = cat(3, [1, 0, 0, 0]', zeros(4, 1), zeros(4, 1));
 		 
 for k = 1:3
-	a{k} = quantity.Symbolic(A(:,:,k), 'grid', Z, 'variable', z);
+	a{k} = quantity.Symbolic(A(:,:,k), 'grid', Z, 'gridName', 'z');
 end
 		 
 A = quantity.Operator(a, 's', s);
@@ -49,7 +49,7 @@ function testFundamentalMatrixSpaceDependent(testCase)
 	z = sym('z', 'real');
 	Z = linspace(0, 1, 32)';
 	A = quantity.Operator(...
-		{quantity.Symbolic([1, z; 0, a], 'variable', 'z', 'grid', Z)});
+		{quantity.Symbolic([1, z; 0, a], 'gridName', 'z', 'grid', Z)});
 	
 	F = A.stateTransitionMatrix();
 		
-- 
GitLab