Skip to content

Commit 6f27c36

Browse files
committed
RAVEN 2.10.4
2 parents cd82b5c + c9745ec commit 6f27c36

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+2546
-2558
lines changed

INIT/ftINIT.m

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,7 @@
5454
% useScoresForTasks true if the calculated reaction scored should be
5555
% used as weights when fitting to tasks (optional, default
5656
% true)
57-
% paramsFT parameter structure as used by getMILPParams. This
58-
% is for the fitTasks step. For the INIT algorithm,
59-
% see params (optional, default [])
57+
% paramsFT *obsolete option*
6058
% verbose if true, the MILP progression will be shown.
6159
% (optional, default false)
6260
%

INIT/ftINITFillGaps.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
% reference tModel.
2424
% The solver will try to maximize the sum of the
2525
% scores for the included reactions
26-
% params parameter structure as used by getMILPParams
26+
% params *obsolete option*
2727
% verbose if true, the MILP progression will be shown.
2828
%
2929
% addedRxns the rxns added

INIT/ftINITFillGapsForAllTasks.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
% reactions (optional, default is -1 for all reactions)
1919
% taskStructure structure with the tasks, as from parseTaskList. If
2020
% this is supplied then inputFile is ignored
21-
% params parameter structure as used by getMILPParams
21+
% params *obsolete option*
2222
% verbose if true, the MILP progression will be shown.
2323
%
2424
%

INIT/ftINITFillGapsMILP.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
% with the same number of elements as reactions in the model,
1313
% of a vector of indexes for the reactions that should be
1414
% minimized (optional, default model.rxns)
15-
% params parameter structure as used by getMILPParams (optional)
15+
% params *obsolete option*
1616
% scores vector of weights for the reactions. Negative scores
1717
% should not have flux. Positive scores are not possible in this
1818
% implementation, and they are changed to max(scores(scores<0)).

INIT/getINITModel.m

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
function [model, metProduction, essentialRxnsForTasks, addedRxnsForTasks, deletedDeadEndRxns, deletedRxnsInINIT, taskReport]=getINITModel(refModel, tissue, celltype, hpaData, arrayData, metabolomicsData, taskFile, useScoresForTasks, printReport, taskStructure, params, paramsFT)
1+
function [model, metProduction, essentialRxnsForTasks, addedRxnsForTasks, deletedDeadEndRxns, deletedRxnsInINIT, taskReport]=getINITModel(refModel, tissue, celltype, hpaData, arrayData, metabolomicsData, taskFile, useScoresForTasks, printReport, taskStructure)
22
% getINITModel_legacy
33
% Generates a model using the INIT algorithm, based on proteomics and/or
44
% transcriptomics and/or metabolomics and/or metabolic tasks. This is the original
55
% implementation of tINIT, which is replaced by ftINIT.
66
%
7-
% Input:
7+
% Input:
88
% refModel a model structure. The model should be in the
99
% closed form (no exchange reactions open). Import
1010
% using import(filename,false). If the model is not
@@ -53,15 +53,8 @@
5353
% as an alternative way to define tasks when Excel
5454
% sheets are not suitable. Overrides taskFile (optional,
5555
% default [])
56-
% params parameter structure as used by getMILPParams. This is
57-
% for the INIT algorithm. For the the MILP problems
58-
% solved to fit tasks, see paramsFT (optional, default [])
59-
% paramsFT parameter structure as used by getMILPParams. This is
60-
% for the fitTasks step. For the INIT algorithm, see
61-
% params (optional, default [])
6256
%
63-
%
64-
% Output:
57+
% Output:
6558
% model the resulting model structure
6659
% metProduction array that indicates which of the
6760
% metabolites in metabolomicsData that could be

INIT/runINIT.m

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
function [outModel, deletedRxns, metProduction, fValue]=runINIT(model,rxnScores,presentMets,essentialRxns,prodWeight,allowExcretion,noRevLoops,params)
1+
function [outModel, deletedRxns, metProduction, fValue]=runINIT(model,rxnScores,presentMets,essentialRxns,prodWeight,allowExcretion,noRevLoops)
22
% runINIT
33
% Generates a model using the INIT algorithm, based on proteomics and/or
44
% transcriptomics and/or metabolomics and/or metabolic tasks. This is the
@@ -38,8 +38,6 @@
3838
% problem significantly more computationally intensive to
3939
% solve (two more integer constraints per reversible reaction)
4040
% (optional, default false)
41-
% params parameter structure as used by getMILPParams (optional,
42-
% default [])
4341
%
4442
% outModel the resulting model structure
4543
% deletedRxns reactions which were deleted by the algorithm

core/consumeSomething.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
% fluxes instead of the sum. Slower, but can be
2020
% used if the sum gives too many fluxes (optional, default
2121
% false)
22-
% params parameter structure as used by getMILPParams (optional)
22+
% params *obsolete option*
2323
% ignoreIntBounds true if internal bounds (including reversibility)
2424
% should be ignored. Exchange reactions are not affected.
2525
% This can be used to find unbalanced solutions which are

core/fillGaps.m

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
function [newConnected, cannotConnect, addedRxns, newModel, exitFlag]=fillGaps(model,models,allowNetProduction,useModelConstraints,supressWarnings,rxnScores,params)
1+
function [newConnected, cannotConnect, addedRxns, newModel, exitFlag]=fillGaps(model,models,allowNetProduction,useModelConstraints,supressWarnings,rxnScores)
22
% fillGaps
33
% Uses template model(s) to fill gaps in a model
44
%
@@ -24,7 +24,6 @@
2424
% The solver will try to maximize the sum of the
2525
% scores for the included reactions (optional, default
2626
% is -1 for all reactions)
27-
% params parameter structure as used by getMILPParams (optional)
2827
%
2928
% newConnected cell array with the reactions that could be
3029
% connected. This is not calulated if

core/fitTasks.m

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
function [outModel, addedRxns]=fitTasks(model,refModel,inputFile,printOutput,rxnScores,taskStructure,params)
1+
function [outModel, addedRxns]=fitTasks(model,refModel,inputFile,printOutput,rxnScores,taskStructure)
22
% fitTasks
33
% Fills gaps in a model by including reactions from a reference model,
44
% so that the resulting model can perform all the tasks in a task list
@@ -17,7 +17,6 @@
1717
% reactions (optional, default is -1 for all reactions)
1818
% taskStructure structure with the tasks, as from parseTaskList. If
1919
% this is supplied then inputFile is ignored (optional)
20-
% params parameter structure as used by getMILPParams (optional)
2120
%
2221
%
2322
% Output:

core/getMinNrFluxes.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
% with the same number of elements as reactions in the model,
99
% of a vector of indexes for the reactions that should be
1010
% minimized (optional, default model.rxns)
11-
% params parameter structure as used by getMILPParams (optional)
11+
% params *obsolete option*
1212
% scores vector of weights for the reactions. Negative scores
1313
% should not have flux. Positive scores are not possible in this
1414
% implementation, and they are changed to max(scores(scores<0)).

0 commit comments

Comments
 (0)