Skip to content

Commit 5c95905

Browse files
Merge pull request #23 from LewisLabUCSD/develop
Regular merge of develop
2 parents 4e2704a + a28ae0c commit 5c95905

File tree

8 files changed

+2
-12
lines changed

8 files changed

+2
-12
lines changed

test/base/getEnvironment.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
% environment: a struct with two fields
88
% * .globals - contains all global values
99
% * .path - contains the current path
10-
%
1110
% NOTE:
1211
% this function has been uploaded from
1312
% https://github.com/opencobra/cobratoolbox/blob/master/src/base/utilities/getEnvironment.m

test/base/getFilesInDir.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
% https://github.com/opencobra/cobratoolbox/blob/master/src/base/install/getFilesInDir.m
5050
% [cdb2478]
5151

52-
5352
persistent COBRAIgnored
5453

5554
if isempty(COBRAIgnored)

test/base/getGlobalValue.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
% https://github.com/opencobra/cobratoolbox/blob/master/src/base/utilities/getGlobalValue.m
1616
% [e6b4efd]
1717

18-
1918
eval(['global ' globalName]);
2019
eval(['value = ' globalName ';']);
2120
end

test/base/getIgnoredFiles.m

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,11 @@
1616
%
1717
% .. Authors: - Original Code: Laurent Heirendt
1818
% - Move to function: Thomas Pfau, Jan 2018
19-
%
2019
% NOTE:
2120
% this function has been adapted from
2221
% https://github.com/opencobra/cobratoolbox/blob/master/src/base/install/getIgnoredFiles.m
2322
% [f9a9213]
2423

25-
26-
2724
global CELLFIEDIR
2825

2926
fid = fopen([CELLFIEDIR filesep '.gitignore']);

test/base/restoreEnvironment.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ function restoreEnvironment(environment, restorePath, printLevel)
1212
% printLevel: Set the verbosity of this method:
1313
% * 0: No outputs (Default)
1414
% * 1: Info what each value is set to
15-
%
1615
% NOTE:
1716
% this function has been adapted from
1817
% https://github.com/opencobra/cobratoolbox/blob/master/src/base/utilities/restoreEnvironment.m

test/base/runScriptFile.m

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
function result = runScriptFile(fileName)
22
% This function runs the test in fileName
33
% It can distinguish between skipped and Failed tests. A test is considered
4-
% to be skipped if it throws a COBRA:RequirementsNotMet error.
4+
% to be skipped if it throws a CELLFIE:RequirementsNotMet error.
55
%
66
% OUTPUTS:
77
%
@@ -23,7 +23,6 @@
2323
% https://github.com/opencobra/cobratoolbox/blob/master/test/runScriptFile.m
2424
% [b58da0c]
2525

26-
2726
global CBT_MISSING_REQUIREMENTS_ERROR_ID
2827

2928
CELLFIE_TESTSUITE_TESTFILE = fileName;

test/base/runTestSuite.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
% https://github.com/opencobra/cobratoolbox/blob/master/test/runTestSuite.m
3131
% [5395578]
3232

33-
3433
global CELLFIEDIR
3534

3635
if ~exist('testNames','var')

test/base/setGlobal.m

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,13 @@ function setGlobal(globalName,globalValue)
66
%
77
% INPUTS:
88
% globalName: A string representing the name of the global variable
9-
% globalValue: The value to set the global variable
9+
% globalValue: The value to set the global variable to
1010
%
1111
% NOTE:
1212
% this function has been adapted from
1313
% https://github.com/opencobra/cobratoolbox/blob/master/src/base/utilities/setGlobal.m
1414
% [e6b4efd]
1515

16-
1716
eval([ globalName '_val = globalValue;']);
1817
eval(['global ' globalName]);
1918
eval([globalName ' = ' globalName '_val;']);

0 commit comments

Comments
 (0)