Skip to content

Commit 2fd75bb

Browse files
Update styling.
1 parent a49cd58 commit 2fd75bb

File tree

8 files changed

+23
-23
lines changed

8 files changed

+23
-23
lines changed

+dj/Computed.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
classdef Computed < dj.internal.AutoPopulate
22
% defines a computed table
33
properties(Constant)
4-
tierRegexp = ['(?<computed>' ...
5-
dj.Schema.tierPrefixes{strcmp(dj.Schema.allowedTiers, 'computed')} ...
6-
dj.Schema.baseRegexp ')']
4+
tierRegexp = sprintf('(?<computed>%s%s)', ...
5+
dj.Schema.tierPrefixes{strcmp(dj.Schema.allowedTiers, 'computed')}, ...
6+
dj.Schema.baseRegexp)
77
end
88
methods
99
function self = Computed(varargin)

+dj/Imported.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
classdef Imported < dj.internal.AutoPopulate
22
% defines an imported table
33
properties(Constant)
4-
tierRegexp = ['(?<imported>' ...
5-
dj.Schema.tierPrefixes{strcmp(dj.Schema.allowedTiers, 'imported')} ...
6-
dj.Schema.baseRegexp ')']
4+
tierRegexp = sprintf('(?<imported>%s%s)', ...
5+
dj.Schema.tierPrefixes{strcmp(dj.Schema.allowedTiers, 'imported')}, ...
6+
dj.Schema.baseRegexp)
77
end
88
methods
99
function self = Imported(varargin)

+dj/Jobs.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
classdef Jobs < dj.Relvar
22
properties(Constant)
3-
tierRegexp = ['(?<job>' ...
4-
dj.Schema.tierPrefixes{strcmp(dj.Schema.allowedTiers, 'job')} ...
5-
dj.Schema.baseRegexp ')']
3+
tierRegexp = sprintf('(?<job>%s%s)', ...
4+
dj.Schema.tierPrefixes{strcmp(dj.Schema.allowedTiers, 'job')}, ...
5+
dj.Schema.baseRegexp)
66
end
77
methods
88
function self = Jobs(varargin)

+dj/Lookup.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
classdef Lookup < dj.internal.UserRelation
22
% defines a lookup table
33
properties(Constant)
4-
tierRegexp = ['(?<lookup>' ...
5-
dj.Schema.tierPrefixes{strcmp(dj.Schema.allowedTiers, 'lookup')} ...
6-
dj.Schema.baseRegexp ')']
4+
tierRegexp = sprintf('(?<lookup>%s%s)', ...
5+
dj.Schema.tierPrefixes{strcmp(dj.Schema.allowedTiers, 'lookup')}, ...
6+
dj.Schema.baseRegexp)
77
end
88
methods
99
function self = Lookup(varargin)

+dj/Manual.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
classdef Manual < dj.internal.UserRelation
22
% Defines a manual table
33
properties(Constant)
4-
tierRegexp = ['(?<manual>' ...
5-
dj.Schema.tierPrefixes{strcmp(dj.Schema.allowedTiers, 'manual')} ...
6-
dj.Schema.baseRegexp ')']
4+
tierRegexp = sprintf('(?<manual>%s%s)', ...
5+
dj.Schema.tierPrefixes{strcmp(dj.Schema.allowedTiers, 'manual')}, ...
6+
dj.Schema.baseRegexp)
77
end
88
methods
99
function self = Manual(varargin)

tests/Prep.m

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,11 +148,11 @@ function dispose(testCase)
148148
dirFlags = [files.isdir] & ~strcmp({files.name},'.') & ~strcmp({files.name},'..');
149149
subFolders = files(dirFlags);
150150
for k = 1 : length(subFolders)
151-
delete([testCase.test_root '/test_schemas/' subFolders(k).name ...
152-
'/getSchema.m']);
151+
delete(sprintf('%s/test_schemas/%s/getSchema.m', ...
152+
testCase.test_root, subFolders(k).name));
153153
if strcmp(subFolders(k).name, '+Lab')
154-
delete([testCase.test_root '/test_schemas/' subFolders(k).name ...
155-
'/Jobs.m']);
154+
delete(sprintf('%s/test_schemas/%s/Jobs.m', ...
155+
testCase.test_root, subFolders(k).name));
156156
end
157157
% delete(['test_schemas/+University/getSchema.m'])
158158
end

tests/TestConfig.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ function TestConfig_testLoad(testCase)
199199
[pkg_path '/test_schemas/config_lite.json'], jsondecode(base));
200200
% test load on launch MATLAB
201201
clear functions;
202-
dj.config.load([pkg_path '/test_schemas/config_lite.json']);
202+
dj.config.load(sprintf('%s/test_schemas/config_lite.json', pkg_path));
203203
% cleanup
204204
dj.config.restore;
205205
end

tests/TestSchema.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,10 @@ function TestSchema_testVirtual(testCase)
113113
testCase.CONN_INFO.host, ...
114114
testCase.CONN_INFO.user, ...
115115
testCase.CONN_INFO.password,'',true);
116-
dj.createSchema(package,[testCase.test_root '/test_schemas'], ...
117-
[testCase.PREFIX '_' lower(package)]);
116+
dj.createSchema(package, sprintf('%s/test_schemas', testCase.test_root), ...
117+
sprintf('%s_%s', testCase.PREFIX, lower(package)));
118118
Lab.SessionAnalysis()
119-
schema = dj.Schema(c1, package, [testCase.PREFIX '_' lower(package)]);
119+
schema = dj.Schema(c1, package, sprintf('%s_%s', testCase.PREFIX, lower(package)));
120120
schema.v.SessionAnalysis()
121121
end
122122
end

0 commit comments

Comments
 (0)