[gnumeric] solvers: rename service field to proper "model_type".



commit 592bcb7aa42c2371b034bb9033dfaa4f487e9fb0
Author: Morten Welinder <terra gnome org>
Date:   Fri May 21 15:17:12 2010 -0400

    solvers: rename service field to proper "model_type".

 plugins/glpk/plugin.xml.in    |    2 +-
 plugins/lpsolve/plugin.xml.in |    2 +-
 src/gnm-plugin.c              |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/plugins/glpk/plugin.xml.in b/plugins/glpk/plugin.xml.in
index f9db0da..59e2619 100644
--- a/plugins/glpk/plugin.xml.in
+++ b/plugins/glpk/plugin.xml.in
@@ -20,7 +20,7 @@
 		</service>
 		<service type="solver"
 			 id="glpk"
-			 problem_type="mip">
+			 model_type="mip">
 			<information>
 			  <_description>GLPK</_description>
 			</information>
diff --git a/plugins/lpsolve/plugin.xml.in b/plugins/lpsolve/plugin.xml.in
index deedb12..8983731 100644
--- a/plugins/lpsolve/plugin.xml.in
+++ b/plugins/lpsolve/plugin.xml.in
@@ -20,7 +20,7 @@
 		</service>
 		<service type="solver"
 			 id="lpsolve"
-			 problem_type="mip">
+			 model_type="mip">
 			<information>
 			  <_description>LPSolve</_description>
 			</information>
diff --git a/src/gnm-plugin.c b/src/gnm-plugin.c
index ef139c6..2247266 100644
--- a/src/gnm-plugin.c
+++ b/src/gnm-plugin.c
@@ -564,11 +564,11 @@ plugin_service_solver_read_xml (GOPluginService *service, xmlNode *tree,
 
 	GO_INIT_RET_ERROR_INFO (ret_error);
 
-	s_type = go_xml_node_get_cstr (tree, "problem_type");
+	s_type = go_xml_node_get_cstr (tree, "model_type");
 	if (s_type && strcmp (CXML2C (s_type), "mip") == 0)
 		type = GNM_SOLVER_LP;
 	else {
-		*ret_error = go_error_info_new_str (_("Invalid solver problem type."));
+		*ret_error = go_error_info_new_str (_("Invalid solver model type."));
 		return;
 	}
 	xmlFree (s_type);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]