max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-16 00:28:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

ListComponents is now cached

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4464 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2010-05-25 00:47:02 +00:00
parent 4480134e5d
commit 1874da5f1d
2 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
IPhreeqc.cpp
View File

@ -37,7 +37,8 @@ int istream_getc(void *cookie)
IPhreeqc::IPhreeqc(void)
: DatabaseLoaded(false)
, ClearAccumulatedLinesOnNextAccumulate(false)
, ClearAccumulated(false)
, UpdateComponents(true)
, SelectedOutputOn(false)
, OutputOn(false)
, LogOn(false)
@ -66,10 +67,10 @@ VRESULT IPhreeqc::AccumulateLine(const char *line)
{
try
{
if (this->ClearAccumulatedLinesOnNextAccumulate)
if (this->ClearAccumulated)
{
this->ClearAccumulatedLines();
this->ClearAccumulatedLinesOnNextAccumulate = false;
this->ClearAccumulated = false;
}
this->ErrorReporter->Clear();
@ -108,7 +109,7 @@ const std::string& IPhreeqc::GetAccumulatedLines(void)
const char* IPhreeqc::GetComponent(int n)
{
static const char empty[] = "";
this->Components = this->ListComponents();
this->ListComponents();
if (n < 0 || n >= (int)this->Components.size())
{
return empty;
@ -123,9 +124,8 @@ const char* IPhreeqc::GetComponent(int n)
size_t IPhreeqc::GetComponentCount(void)
{
std::list< std::string > comps;
this->PhreeqcPtr->list_components(comps);
return comps.size();
this->ListComponents();
return this->Components.size();
}
bool IPhreeqc::GetDumpFileOn(void)const
@ -272,9 +272,13 @@ int IPhreeqc::GetWarningStringLineCount(void)const
std::list< std::string > IPhreeqc::ListComponents(void)
{
std::list< std::string > comps;
this->PhreeqcPtr->list_components(comps);
return comps;
if (this->UpdateComponents)
{
this->Components.clear();
this->PhreeqcPtr->list_components(this->Components);
this->UpdateComponents = false;
}
return this->Components;
}
int IPhreeqc::LoadDatabase(const char* filename)
@ -410,7 +414,7 @@ int IPhreeqc::RunAccumulated(void)
}
}
this->ClearAccumulatedLinesOnNextAccumulate = true;
this->ClearAccumulated = true;
this->PhreeqcPtr->close_output_files();
this->update_errors();
@ -541,6 +545,8 @@ void IPhreeqc::UnLoadDatabase(void)
// init IPhreeqc
//
this->DatabaseLoaded = false;
this->UpdateComponents = true;
this->Components.clear();
// clear error state
//
@ -1262,6 +1268,7 @@ void IPhreeqc::do_run(const char* sz_routine, std::istream* pis, FILE* fp, PFN_P
pfn_post(cookie);
}
this->UpdateComponents = true;
this->update_errors();
}

17
IPhreeqcLib.cpp
View File

@ -88,24 +88,11 @@ const char*
GetComponent(int id, int n)
{
static const char err_msg[] = "GetComponent: Invalid instance id.\n";
static const char empty[] = "";
static std::string comp;
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
if (IPhreeqcPtr)
{
std::list< std::string > comps = IPhreeqcPtr->ListComponents();
if (n < 0 || n >= (int)comps.size())
{
return empty;
}
std::list< std::string >::iterator it = comps.begin();
for(int i = 0; i < n; ++i)
{
++it;
}
comp = (*it);
return comp.c_str();
return IPhreeqcPtr->GetComponent(n);
}
return err_msg;
}
@ -116,7 +103,7 @@ GetComponentCount(int id)
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
if (IPhreeqcPtr)
{
return (int)IPhreeqcPtr->ListComponents().size();
return (int)IPhreeqcPtr->GetComponentCount();
}
return IPQ_BADINSTANCE;
}