From a8c61585430a4b17c6d6996435c6cbf3f1a55a0f Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Mon, 17 Oct 2016 17:46:02 -0400 Subject: [PATCH] [Matlab] Remove partial implementations of unneeded methods --- src/matlab/flowdevicemethods.cpp | 3 --- src/matlab/mixturemethods.cpp | 3 --- src/matlab/phasemethods.cpp | 7 ------- src/matlab/reactormethods.cpp | 3 --- src/matlab/reactornetmethods.cpp | 3 --- src/matlab/wallmethods.cpp | 3 --- src/matlab/xmlmethods.cpp | 26 +------------------------- 7 files changed, 1 insertion(+), 47 deletions(-) diff --git a/src/matlab/flowdevicemethods.cpp b/src/matlab/flowdevicemethods.cpp index 067decba0..98b74dba8 100644 --- a/src/matlab/flowdevicemethods.cpp +++ b/src/matlab/flowdevicemethods.cpp @@ -50,9 +50,6 @@ void flowdevicemethods(int nlhs, mxArray* plhs[], case 5: iok = flowdev_setFunction(i, int(v)); break; - case 6: - iok = flowdev_ready(i); - break; case 7: iok = flowdev_setMaster(i, int(v)); break; diff --git a/src/matlab/mixturemethods.cpp b/src/matlab/mixturemethods.cpp index 41ab3f5d2..452a4d23e 100644 --- a/src/matlab/mixturemethods.cpp +++ b/src/matlab/mixturemethods.cpp @@ -47,9 +47,6 @@ void mixturemethods(int nlhs, mxArray* plhs[], case 1: iok = mix_del(i); break; - case 2: - iok = mix_copy(i); - break; case 4: checkNArgs(5, nrhs); moles = getDouble(prhs[4]); diff --git a/src/matlab/phasemethods.cpp b/src/matlab/phasemethods.cpp index 38bc5b135..d166e3277 100644 --- a/src/matlab/phasemethods.cpp +++ b/src/matlab/phasemethods.cpp @@ -139,13 +139,6 @@ void phasemethods(int nlhs, mxArray* plhs[], reportError(); } break; - case 8: - vv = phase_density(ph); - if (vv == DERR) { - reportError(); - } - vv = 1.0/vv; - break; case 10: vv = static_cast(phase_nElements(ph)); if (vv == -1) { diff --git a/src/matlab/reactormethods.cpp b/src/matlab/reactormethods.cpp index 062a39d70..525437710 100644 --- a/src/matlab/reactormethods.cpp +++ b/src/matlab/reactormethods.cpp @@ -39,9 +39,6 @@ void reactormethods(int nlhs, mxArray* plhs[], case 1: iok = reactor_del(i); break; - case 2: - iok = reactor_copy(i); - break; case 4: iok = reactor_setInitialVolume(i, v); break; diff --git a/src/matlab/reactornetmethods.cpp b/src/matlab/reactornetmethods.cpp index ade81f9e4..37425911a 100644 --- a/src/matlab/reactornetmethods.cpp +++ b/src/matlab/reactornetmethods.cpp @@ -43,9 +43,6 @@ void reactornetmethods(int nlhs, mxArray* plhs[], case 1: iok = reactornet_del(i); break; - case 2: - iok = reactornet_copy(i); - break; case 4: iok = reactornet_addreactor(i, int(v)); break; diff --git a/src/matlab/wallmethods.cpp b/src/matlab/wallmethods.cpp index 47497ba4b..d358c81d8 100644 --- a/src/matlab/wallmethods.cpp +++ b/src/matlab/wallmethods.cpp @@ -39,9 +39,6 @@ void wallmethods(int nlhs, mxArray* plhs[], case 1: iok = wall_del(i); break; - case 2: - iok = wall_copy(i); - break; case 4: m = getInt(prhs[4]); iok = wall_install(i, int(v), m); diff --git a/src/matlab/xmlmethods.cpp b/src/matlab/xmlmethods.cpp index adf5a228d..08bc1f8e1 100644 --- a/src/matlab/xmlmethods.cpp +++ b/src/matlab/xmlmethods.cpp @@ -42,7 +42,7 @@ static bool nargs_ok(int job, int n) void xmlmethods(int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]) { - int j, m, iok = 0; + int iok = 0; char* file, *key, *val, *nm; int job = getInt(prhs[1]); int i = getInt(prhs[2]); @@ -65,26 +65,14 @@ void xmlmethods(int nlhs, mxArray* plhs[], case 1: iok = xml_del(i); break; - case 2: - iok = xml_copy(i); - break; case 4: file = getString(prhs[3]); iok = xml_build(i, file); break; - case 5: - key = getString(prhs[3]); - val = getString(prhs[4]); - iok = xml_addAttrib(i, key, val); - break; case 6: key = getString(prhs[3]); iok = xml_child(i, key); break; - case 7: - m = getInt(prhs[3]); - iok = xml_child_bynumber(i, m); - break; case 8: key = getString(prhs[3]); iok = xml_findID(i, key); @@ -101,19 +89,10 @@ void xmlmethods(int nlhs, mxArray* plhs[], val = getString(prhs[4]); iok = xml_addChild(i, key, val); break; - case 12: - key = getString(prhs[3]); - j = getInt(prhs[4]); - iok = xml_addChildNode(i, j); - break; case 13: file = getString(prhs[3]); iok = xml_write(i, file); break; - case 14: - j = getInt(prhs[3]); - iok = xml_removeChild(i, j); - break; case 15: file = getString(prhs[3]); iok = xml_get_XML_File(file, 0); @@ -142,9 +121,6 @@ void xmlmethods(int nlhs, mxArray* plhs[], // return the value of the node iok = xml_value(i, v); break; - case 22: - iok = xml_tag(i, v); - break; default: mexErrMsgTxt("unknown job parameter"); }