[Matlab] Cleanup conditionals and constants

mpsonntag · mpsonntag · commit d5db5019a7d7 · 2017-08-28T21:56:53.000+02:00
diff --git a/+nix/Block.m b/+nix/Block.m
@@ -91,15 +91,15 @@
             %-- 1D data arrays created with this function.
             %-- e.g. size([1 2 3]) returns shape [1 3], which would not
             %-- be accepted when trying to add an alias range dimension.
-            if(shape(1) == 1)
+            if (shape(1) == 1)
                 shape(2:size(shape, 2));
             end
 
             errorStruct.identifier = 'Block:unsupportedDataType';
-            if(~isa(datatype, 'nix.DataType'))
+            if (~isa(datatype, 'nix.DataType'))
                 errorStruct.message = 'Please provide a valid nix.DataType';
                 error(errorStruct);
-            elseif(isequal(datatype, nix.DataType.String))
+            elseif (isequal(datatype, nix.DataType.String))
                 errorStruct.message = 'Writing Strings to DataArrays is not supported as of yet.';
                 error(errorStruct);
             else
@@ -115,17 +115,17 @@
             %-- 1D data arrays created with this function.
             %-- e.g. size([1 2 3]) returns shape [1 3], which would not
             %-- be accepted when trying to add an alias range dimension.
-            if(shape(1) == 1)
+            if (shape(1) == 1)
                 shape = size(data, 2);
             end
 
             errorStruct.identifier = 'Block:unsupportedDataType';
-            if(ischar(data))
+            if (ischar(data))
                 errorStruct.message = 'Writing Strings to DataArrays is not supported as of yet.';
                 error(errorStruct);
-            elseif(islogical(data))
+            elseif (islogical(data))
                 dtype = nix.DataType.Bool;
-            elseif(isnumeric(data))
+            elseif (isnumeric(data))
                 dtype = nix.DataType.Double;
             else
                 errorStruct.message = 'DataType of provided data is not supported.';
@@ -267,7 +267,7 @@
 
         %-- Creating a multitag requires an already existing data array
         function r = create_multi_tag(obj, name, type, add_data_array)
-            if(strcmp(class(add_data_array), 'nix.DataArray'))
+            if (strcmp(class(add_data_array), 'nix.DataArray'))
                 addID = add_data_array.id;
             else
                 addID = add_data_array;
diff --git a/+nix/DataArray.m b/+nix/DataArray.m
@@ -83,7 +83,7 @@
         % instead of 0 compared to all other index functions.
             fname = strcat(obj.alias, '::openDimensionIdx');
             dim = nix_mx(fname, obj.nix_handle, idx);
-            switch(dim.dimension_type)
+            switch (dim.dimension_type)
                 case 'set'
                     r = nix.SetDimension(dim.handle);
                 case 'sampled'
@@ -117,21 +117,21 @@
         %-- If a DataArray has been created as boolean or numeric,
         %-- provide that only values of the proper DataType can be written.
         function [] = write_all(obj, data)
-            if(isinteger(obj.read_all) && isfloat(data))
+            if (isinteger(obj.read_all) && isfloat(data))
                 disp('Warning: Writing Float data to an Integer DataArray');
             end
 
             errorStruct.identifier = 'DataArray:improperDataType';
-            if(islogical(obj.read_all) && ~islogical(data))
+            if (islogical(obj.read_all) && ~islogical(data))
                 errorStruct.message = strcat('Trying to write', ...
                     32, class(data), ' to a logical DataArray.');
                 error(errorStruct);
-            elseif(isnumeric(obj.read_all) && ~isnumeric(data))
+            elseif (isnumeric(obj.read_all) && ~isnumeric(data))
                 errorStruct.message = strcat('Trying to write', ...
                     32, class(data), ' to a ', 32, class(obj.read_all), ...
                     ' DataArray.');
                 error(errorStruct);
-            elseif(ischar(data))
+            elseif (ischar(data))
                 %-- Should actually not be reachable at the moment, 
                 %-- since writing Strings to DataArrays is not supported,
                 %-- but safety first.
diff --git a/+nix/Dynamic.m b/+nix/Dynamic.m
@@ -12,7 +12,7 @@
 
     methods (Static)
         function add_dyn_attr(obj, prop, mode)
-            if nargin < 3
+            if (nargin < 3)
                 mode = 'r'; 
             end
 
@@ -24,7 +24,7 @@ function add_dyn_attr(obj, prop, mode)
             p.SetMethod = @set_method;
 
             function set_method(obj, val)
-                if strcmp(mode, 'r')
+                if (strcmp(mode, 'r'))
                     ME = MException('MATLAB:class:SetProhibited', sprintf(...
                       'You cannot set the read-only property ''%s'' of %s', ...
                       prop, class(obj)));
@@ -34,7 +34,7 @@ function set_method(obj, val)
                 if (isempty(val))
                     fname = strcat(obj.alias, '::setNone', upper(prop(1)), prop(2:end));
                     nix_mx(fname, obj.nix_handle, 0);
-                elseif((strcmp(prop, 'units') || strcmp(prop, 'labels')) && (~iscell(val)))
+                elseif ((strcmp(prop, 'units') || strcmp(prop, 'labels')) && (~iscell(val)))
                 %-- BUGFIX: Matlab crashes, if units in Tags and MultiTags
                 %-- or labels of SetDimension are set using anything else than a cell.
                     ME = MException('MATLAB:class:SetProhibited', sprintf(...
@@ -78,7 +78,7 @@ function add_dyn_relation(obj, name, constructor)
                 val = containers.Map();
                 props = obj.(name);
 
-                for i=1:length(props)
+                for i = 1:length(props)
                     val(props{i}.name) = cell2mat(props{i}.values);
                 end
             end
diff --git a/+nix/Feature.m b/+nix/Feature.m
@@ -45,7 +45,7 @@
         end
 
         function [] = set_data(obj, setData)
-            if(strcmp(class(setData), 'nix.DataArray'))
+            if (strcmp(class(setData), 'nix.DataArray'))
                 setData = setData.id;
             end
             fname = strcat(obj.alias, '::setData');
diff --git a/+nix/File.m b/+nix/File.m
@@ -16,7 +16,7 @@
 
     methods
         function obj = File(path, mode)
-            if ~exist('mode', 'var')
+            if (~exist('mode', 'var'))
                 mode = nix.FileMode.ReadWrite; %default to ReadWrite
             end
             h = nix_mx('File::open', path, mode); 
diff --git a/+nix/FileMode.m b/+nix/FileMode.m
@@ -10,9 +10,9 @@
     % FILEMODE nix file open modes
 
     properties (Constant)
-        ReadOnly = uint8(0)
-        ReadWrite = uint8(1)
-        Overwrite = uint8(2)
+        ReadOnly = uint8(0);
+        ReadWrite = uint8(1);
+        Overwrite = uint8(2);
     end
 
 end
diff --git a/+nix/LinkType.m b/+nix/LinkType.m
@@ -10,9 +10,9 @@
     % LINKTYPE nix link types
 
     properties (Constant)
-        Tagged = uint8(0)
-        Untagged = uint8(1)
-        Indexed = uint8(2)
+        Tagged = uint8(0);
+        Untagged = uint8(1);
+        Indexed = uint8(2);
     end
 
 end
diff --git a/+nix/MultiTag.m b/+nix/MultiTag.m
@@ -89,7 +89,7 @@
         % ------------------
 
         function r = add_feature(obj, add_this, link_type)
-            if(strcmp(class(add_this), 'nix.DataArray'))
+            if (strcmp(class(add_this), 'nix.DataArray'))
                 addID = add_this.id;
             else
                 addID = add_this;
@@ -175,7 +175,7 @@
         end
 
         function [] = set_extents(obj, add_this)
-            if(isempty(add_this))
+            if (isempty(add_this))
                 fname = strcat(obj.alias, '::setNoneExtents');
                 nix_mx(fname, obj.nix_handle, 0);
             else
diff --git a/+nix/NamedEntity.m b/+nix/NamedEntity.m
@@ -24,7 +24,7 @@
         function r = compare(obj, entity)
         % Compares first name and second id, return > 0 if the entity 
         % is larger than the other, 0 if both are equal, and < 0 otherwise.
-            if(~strcmp(class(obj), class(entity)))
+            if (~strcmp(class(obj), class(entity)))
                 error('Only entities of the same class can be compared.');
             end
             fname = strcat(obj.alias, '::compare');
diff --git a/+nix/RangeDimension.m b/+nix/RangeDimension.m
@@ -27,7 +27,7 @@
         end
 
         function r = tick_at(obj, index)
-            if index > 0
+            if (index > 0)
                 index = index - 1;
             end
             fname = strcat(obj.alias, '::tickAt');
@@ -40,11 +40,11 @@
         end
 
         function r = axis(obj, count, startIndex)
-            if nargin < 3
+            if (nargin < 3)
                 startIndex = 0;
             end
 
-            if(startIndex > 0)
+            if (startIndex > 0)
                 startIndex = startIndex - 1;
             end
 
diff --git a/+nix/SampledDimension.m b/+nix/SampledDimension.m
@@ -32,7 +32,7 @@
         end
 
         function r = position_at(obj, index)
-            if index > 0
+            if (index > 0)
                 index = index - 1;
             end
 
@@ -41,11 +41,11 @@
         end
 
         function r = axis(obj, count, startIndex)
-            if nargin < 3
+            if (nargin < 3)
                 startIndex = 0;
             end
 
-            if startIndex > 0
+            if (startIndex > 0)
                 startIndex = startIndex - 1;
             end
 
diff --git a/+nix/Utils.m b/+nix/Utils.m
@@ -77,7 +77,7 @@
         function r = open_entity(obj, mxMethod, id_or_name, objConstructor)
             handle = nix_mx(mxMethod, obj.nix_handle, id_or_name);
             r = {};
-            if handle ~= 0
+            if (handle ~= 0)
                 r = objConstructor(handle);
             end
         end
