Skip to content

Commit

Permalink
Merge pull request #361 from MeasureTransport/dannys4/fixMatlabOpts
Browse files Browse the repository at this point in the history
Fix matlab options
  • Loading branch information
dannys4 authored Nov 15, 2023
2 parents 7f4d278 + d224600 commit 95fc04e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions bindings/matlab/src/ConditionalMap_mex.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ MEX_DEFINE(ConditionalMap_newAffineMapb) (int nlhs, mxArray* plhs[],
MEX_DEFINE(ConditionalMap_newTotalTriMap) (int nlhs, mxArray* plhs[],
int nrhs, const mxArray* prhs[]) {

InputArguments input(nrhs, prhs, 15);
InputArguments input(nrhs, prhs, 16);
OutputArguments output(nlhs, plhs, 1);
unsigned int inputDim = input.get<unsigned int>(0);
unsigned int outputDim = input.get<unsigned int>(1);
Expand All @@ -134,7 +134,7 @@ MEX_DEFINE(ConditionalMap_newTotalTriMap) (int nlhs, mxArray* plhs[],
MEX_DEFINE(ConditionalMap_newMap) (int nlhs, mxArray* plhs[],
int nrhs, const mxArray* prhs[]) {

InputArguments input(nrhs, prhs, 13);
InputArguments input(nrhs, prhs, 14);
OutputArguments output(nlhs, plhs, 1);
const MultiIndexSet& mset = Session<MultiIndexSet>::getConst(input.get(0));
MapOptions opts = binding::MapOptionsFromMatlab(input.get<std::string>(1),input.get<std::string>(2),
Expand All @@ -149,7 +149,7 @@ MEX_DEFINE(ConditionalMap_newMap) (int nlhs, mxArray* plhs[],
MEX_DEFINE(ConditionalMap_newMapFixed) (int nlhs, mxArray* plhs[],
int nrhs, const mxArray* prhs[]) {

InputArguments input(nrhs, prhs, 13);
InputArguments input(nrhs, prhs, 14);
OutputArguments output(nlhs, plhs, 1);
const FixedMultiIndexSet<MemorySpace>& mset = Session<FixedMultiIndexSet<MemorySpace>>::getConst(input.get(0));
MapOptions opts = binding::MapOptionsFromMatlab(input.get<std::string>(1),input.get<std::string>(2),
Expand Down
4 changes: 2 additions & 2 deletions bindings/matlab/src/ParameterizedFunctionBase_mex.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ namespace {
MEX_DEFINE(ParameterizedFunction_newMap) (int nlhs, mxArray* plhs[],
int nrhs, const mxArray* prhs[]) {

InputArguments input(nrhs, prhs, 14);
InputArguments input(nrhs, prhs, 15);
OutputArguments output(nlhs, plhs, 1);
unsigned int outputDim = input.get<unsigned int>(0);
const MultiIndexSet& mset = Session<MultiIndexSet>::getConst(input.get(1));
Expand Down Expand Up @@ -205,7 +205,7 @@ MEX_DEFINE(MapOptions_Serialize) (int nlhs, mxArray* plhs[],
int nrhs, const mxArray* prhs[]) {

#if defined(MPART_HAS_CEREAL)
InputArguments input(nrhs, prhs, 13);
InputArguments input(nrhs, prhs, 14);
OutputArguments output(nlhs, plhs, 1);

std::string filename = input.get<std::string>(0);
Expand Down

0 comments on commit 95fc04e

Please sign in to comment.