From 435f2e2eb6553856c2fd7000f6d72fa09dc7b218 Mon Sep 17 00:00:00 2001
From: Scott R Charlton <charlton@usgs.gov>
Date: Thu, 5 Dec 2013 23:59:31 +0000
Subject: [PATCH] Added some assertions; optimized GetSelectedOutputValue;
 added some multi selected-output tests

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8285 1feff8c3-07ed-0310-ac33-dd36852eb9cd
---
 IPhreeqc.cpp | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/IPhreeqc.cpp b/IPhreeqc.cpp
index 45c34369..2d3be5a4 100644
--- a/IPhreeqc.cpp
+++ b/IPhreeqc.cpp
@@ -369,6 +369,7 @@ int IPhreeqc::GetSelectedOutputColumnCount(void)const
 
 int IPhreeqc::GetSelectedOutputCount(void)const
 {
+	ASSERT(this->PhreeqcPtr->SelectedOutput_map.size() == this->CurrentSelectedOutputMap.size());
 	return (int) this->PhreeqcPtr->SelectedOutput_map.size();
 }
 
@@ -459,21 +460,27 @@ VRESULT IPhreeqc::GetSelectedOutputValue(int row, int col, VAR* pVAR)
 		{
 		case VR_OK:
 			break;
+		case VR_INVALIDROW:
+			this->AddError("GetSelectedOutputValue: VR_INVALIDROW Row index out of range.\n");
+			this->update_errors();
+			break;
+		case VR_INVALIDCOL:
+			this->AddError("GetSelectedOutputValue: VR_INVALIDCOL Column index out of range.\n");
+			this->update_errors();
+			break;
 		case VR_OUTOFMEMORY:
 			this->AddError("GetSelectedOutputValue: VR_OUTOFMEMORY Out of memory.\n");
+			this->update_errors();
 			break;
 		case VR_BADVARTYPE:
 			this->AddError("GetSelectedOutputValue: VR_BADVARTYPE pVar must be initialized(VarInit) and/or cleared(VarClear).\n");
+			this->update_errors();
 			break;
 		case VR_INVALIDARG:
 			// not possible
 			break;
-		case VR_INVALIDROW:
-			this->AddError("GetSelectedOutputValue: VR_INVALIDROW Row index out of range.\n");
-			break;
-		case VR_INVALIDCOL:
-			this->AddError("GetSelectedOutputValue: VR_INVALIDCOL Column index out of range.\n");
-			break;
+		default:
+			assert(0);
 		}
 	}
 	else
@@ -482,8 +489,8 @@ VRESULT IPhreeqc::GetSelectedOutputValue(int row, int col, VAR* pVAR)
 		v = VR_INVALIDARG;
 		::sprintf(buffer, "GetSelectedOutputValue: VR_INVALIDARG Invalid selected-output user number %d.\n", this->CurrentSelectedOutputUserNumber);
 		this->AddError(buffer);
+		this->update_errors();
 	}
-	this->update_errors();
 	return v;
 }
 
@@ -1124,6 +1131,7 @@ void IPhreeqc::do_run(const char* sz_routine, std::istream* pis, PFN_PRERUN_CALL
 				ASSERT(this->SelectedOutputMap[(*mit).first] == this->CurrentSelectedOutputMap[&(*mit).second]);
 			}
 		}
+		ASSERT(this->PhreeqcPtr->SelectedOutput_map.size() == this->CurrentSelectedOutputMap.size());
 		if (this->PhreeqcPtr->title_x != NULL)
 		{
 			::sprintf(token, "TITLE");