diff --git a/+quantity/Discrete.m b/+quantity/Discrete.m index 34a0c6cb32c042283936ef402b6df214b93168cf..a40aed241e890d4b53f3692dfc1d74f6c8f25f22 100644 --- a/+quantity/Discrete.m +++ b/+quantity/Discrete.m @@ -6,10 +6,6 @@ classdef (InferiorClasses = {?quantity.Symbolic}) Discrete ... valueDiscrete double; end - properties (Hidden, Access = protected, Dependent) - doNotCopy; - end - properties % ID of the figure handle in which the handle is plotted figureID double = 1; @@ -29,9 +25,9 @@ classdef (InferiorClasses = {?quantity.Symbolic}) Discrete ... % Grid for the evaluation of the continuous quantity. For the % example with the function f(x,t), the grid would be % {[<spatial domain>], [<temporal domain>]} - % whereas <spatial domain> is the discret description of the - % spatial domain and <temporal domain> the discrete description of - % the temporal domain. + % whereas <spatial domain> is the discrete description of the + % spatial domain x and <temporal domain> the discrete description of + % the temporal domain t. grid; % in set.grid it is ensured that, grid is a (1,:)-cell-array end @@ -166,9 +162,6 @@ classdef (InferiorClasses = {?quantity.Symbolic}) Discrete ... itIs = isempty(obj(1).domain); end % isConstant() - function doNotCopy = get.doNotCopy(obj) - doNotCopy = obj.doNotCopyPropertiesName(); - end function valueDiscrete = get.valueDiscrete(obj) % check if the value discrete for this object % has already been computed. @@ -1337,17 +1330,12 @@ classdef (InferiorClasses = {?quantity.Symbolic}) Discrete ... function s = struct(obj, varargin) if (nargin == 1) && isa(obj, "quantity.Discrete") - properties = fieldnames(obj); + tempProperties = fieldnames(obj); si = num2cell( size(obj) ); s(si{:}) = struct(); for l = 1:numel(obj) - - doNotCopyProperties = obj(l).doNotCopy; - - for k = 1:length(properties) - if ~any(strcmp(doNotCopyProperties, properties{k})) - s(l).(properties{k}) = obj(1).(properties{k}); - end + for k = 1:length(tempProperties) + s(l).(tempProperties{k}) = obj(1).(tempProperties{k}); end end else @@ -2818,13 +2806,7 @@ classdef (InferiorClasses = {?quantity.Symbolic}) Discrete ... [sprintf('%ix', obj(1).domain.gridLength, size(obj)) sprintf('\b')]; end end % getPropertyGroups + end % methods (Access = protected) - methods ( Static, Access = protected ) - function doNotCopy = doNotCopyPropertiesName() - % #DEPRECATED - doNotCopy = {'valueContinuous', 'valueDiscrete', 'derivatives'}; - end - end % methods ( Static, Access = protected ) - -end % classdef +end % classdef \ No newline at end of file diff --git a/+quantity/Symbolic.m b/+quantity/Symbolic.m index d57913b40ddd40d0d67626795ac6f0407da77ca6..088f94cdaba58050bc048dc7c24aa8ea5284039d 100644 --- a/+quantity/Symbolic.m +++ b/+quantity/Symbolic.m @@ -829,11 +829,12 @@ classdef Symbolic < quantity.Function p = innerInputNormalizer(a); q = innerInputNormalizer(b); - end - end + end % inputNormalizer() + end % methods (Static) methods (Static, Access = protected) function var = getVariable(symbolicFunction, nVar) + % nVar is needed for overloaded functionality in PolynomialOperator if misc.issym(symbolicFunction(:).') var = symvar(symbolicFunction(:).'); @@ -851,12 +852,8 @@ classdef Symbolic < quantity.Function var = flip(var); end end - end - function doNotCopy = doNotCopyPropertiesName() - parentalProperties = quantity.Discrete.doNotCopyPropertiesName; - doNotCopy = {parentalProperties{:}, ... - 'valueSymbolic', 'isConstant'}; - end + end % getVariable() + function f = setValueContinuous(f, symVar) % converts symVar into a matlabFunction. if isa(f, 'sym') @@ -872,5 +869,5 @@ classdef Symbolic < quantity.Function end end end % setValueContinuous() - end -end + end % methods (Static, Access = protected) +end % classdef \ No newline at end of file