comparison trunk/src/Support/Parameters.cc @ 273:c26222c51fb7

- Fixed the python SWIG wrappers - Added stub test for the Gaussian features, and test data - Fixed build errors
author tomwalters
date Mon, 15 Feb 2010 20:37:26 +0000
parents e14c70d1b171
children e55d0c225a57
comparison
equal deleted inserted replaced
272:2147f317aedc 273:c26222c51fb7
45 } 45 }
46 46
47 const char * Parameters::DefaultString(const char* sName, const char* val) { 47 const char * Parameters::DefaultString(const char* sName, const char* val) {
48 AIM_ASSERT(m_pIni); 48 AIM_ASSERT(m_pIni);
49 if (!IsSet(sName)) { 49 if (!IsSet(sName)) {
50 m_pIni->SetValue(m_SDefaultIniSection, sName, val); 50 SetString(sName, val);
51 } 51 }
52 return m_pIni->GetString(sName); 52 return GetString(sName);
53 } 53 }
54 54
55 int Parameters::DefaultInt(const char* sName, int val) { 55 int Parameters::DefaultInt(const char* sName, int val) {
56 AIM_ASSERT(m_pIni); 56 AIM_ASSERT(m_pIni);
57 if (!IsSet(sName)) { 57 if (!IsSet(sName)) {
58 m_pIni->SetInt(m_SDefaultIniSection, sName, val); 58 SetInt(sName, val);
59 } 59 }
60 return m_pIni->GetInt(sName); 60 return GetInt(sName);
61 } 61 }
62 62
63 unsigned int Parameters::DefaultUInt(const char* sName, unsigned int val) { 63 unsigned int Parameters::DefaultUInt(const char* sName, unsigned int val) {
64 AIM_ASSERT(m_pIni); 64 AIM_ASSERT(m_pIni);
65 if (!IsSet(sName)) { 65 if (!IsSet(sName)) {
66 m_pIni->SetUInt(m_SDefaultIniSection, sName, val); 66 SetUInt(sName, val);
67 } 67 }
68 return m_pIni->GetUInt(sName); 68 return GetUInt(sName);
69 } 69 }
70 70
71 float Parameters::DefaultFloat(const char* sName, float val) { 71 float Parameters::DefaultFloat(const char* sName, float val) {
72 AIM_ASSERT(m_pIni); 72 AIM_ASSERT(m_pIni);
73 if (!IsSet(sName)) { 73 if (!IsSet(sName)) {
74 m_pIni->SetFloat(m_SDefaultIniSection, sName, val); 74 SetFloat(sName, val);
75 } 75 }
76 return m_pIni->GetFloat(sName); 76 return GetFloat(sName);
77 } 77 }
78 78
79 bool Parameters::DefaultBool(const char* sName, bool val) { 79 bool Parameters::DefaultBool(const char* sName, bool val) {
80 AIM_ASSERT(m_pIni); 80 AIM_ASSERT(m_pIni);
81 if (!IsSet(sName)) { 81 if (!IsSet(sName)) {
82 m_pIni->SetBool(m_SDefaultIniSection, sName, val); 82 SetBool(sName, val);
83 } 83 }
84 return m_pIni->GetBool(sName); 84 return GetBool(sName);
85 } 85 }
86 86
87 void Parameters::SetString(const char *sName, const char *val) { 87 void Parameters::SetString(const char *sName, const char *val) {
88 AIM_ASSERT(m_pIni); 88 AIM_ASSERT(m_pIni);
89 m_pIni->SetValue(m_SDefaultIniSection, sName, val); 89 m_pIni->SetValue(m_SDefaultIniSection, sName, val);
262 262
263 fclose(pSaveFile); 263 fclose(pSaveFile);
264 264
265 return true; 265 return true;
266 } 266 }
267
268 std::string Parameters::WriteString() {
269 AIM_ASSERT(m_pIni);
270 SI_Error siErr;
271 std::string output_string;
272
273 if ((siErr = m_pIni->Save(output_string)) < 0 ) {
274 LOG_ERROR(_T("Couldn't write parameters to string"));
275 return false;
276 }
277 return output_string;
278 }
279
267 } // namespace aimc 280 } // namespace aimc