diff --git a/LCS/Common/include/Common/ParameterSet.h b/LCS/Common/include/Common/ParameterSet.h
index 241b80410ae7ed0c7c3eb29be392dcc109adb69a..aee1f7f99ea5897e05fc88f83b90d361f88e8dbf 100644
--- a/LCS/Common/include/Common/ParameterSet.h
+++ b/LCS/Common/include/Common/ParameterSet.h
@@ -140,6 +140,10 @@ public:
// <br>If theCollection is this collection, nothing will be done.
void adoptCollection(const ParameterSet& theCollection,
const string& thePrefix = "");
+
+ // Adds the Key-Values pairs in the argument list.
+ // It ignores arguments not having the Key=Value syntax.
+ void adoptArgv (int nr, char const * const argv[]);
// @}
@@ -340,6 +344,10 @@ public:
// @}
+ // Get all unused parameter names, thus the names of parameters
+ // that have not been asked for.
+ vector<string> unusedKeys() const;
+
// \name Printing
// Mostly for debug purposes the collection can be printed.
// @{
@@ -425,6 +433,11 @@ inline void ParameterSet::adoptCollection (const ParameterSet& theCollection, co
itsSet->adoptCollection (*theCollection.itsSet, thePrefix);
}
+ inline void ParameterSet::adoptArgv (int nr, const char * const argv[])
+{
+ itsSet->adoptArgv (nr, argv);
+}
+
inline void ParameterSet::writeFile (const string& theFilename, bool append) const
{
itsSet->writeFile (theFilename, append);
@@ -858,6 +871,11 @@ inline vector<time_t> ParameterSet::getTimeVector(const string& aKey,
return itsSet->getTimeVector(aKey, aValue, expandable);
}
+inline vector<string> ParameterSet::unusedKeys() const
+{
+ return itsSet->unusedKeys();
+}
+
} // namespace LOFAR
#endif
diff --git a/LCS/Common/include/Common/ParameterSetImpl.h b/LCS/Common/include/Common/ParameterSetImpl.h
index 359c3b2ab6f9856008bb85653fc9d26a5513ebc4..f2e470beb3d1f84533254472833b7ff6d0b9e153 100644
--- a/LCS/Common/include/Common/ParameterSetImpl.h
+++ b/LCS/Common/include/Common/ParameterSetImpl.h
@@ -31,6 +31,7 @@
#include <Common/ParameterValue.h>
#include <Common/LofarTypes.h>
#include <Common/lofar_map.h>
+#include <Common/lofar_set.h>
#include <Common/lofar_string.h>
#include <Common/lofar_vector.h>
#include <Common/lofar_iostream.h>
@@ -125,6 +126,10 @@ public:
// thePrefix.
void adoptCollection(const ParameterSetImpl& theCollection,
const string& thePrefix = "");
+
+ // Adds the Key-Values pairs in the argument list.
+ // It ignores arguments not having the Key=Value syntax.
+ void adoptArgv (int nr, char const * const argv[]);
// @}
@@ -316,6 +321,9 @@ public:
friend std::ostream& operator<<(std::ostream& os, const ParameterSetImpl &thePS);
// @}
+ // Get all unused parameter names.
+ vector<string> unusedKeys() const;
+
private:
// Copying is not needed, thus not allowed.
// @{
@@ -347,6 +355,8 @@ private:
int itsCount;
// Key comparison mode.
const KeyCompare::Mode itsMode;
+ // The set of keys that have been asked.
+ mutable set<string> itsAskedParms;
};
//# -------------------- Global functions --------------------
diff --git a/LCS/Common/src/InputParSet.cc b/LCS/Common/src/InputParSet.cc
index b4f721b8b29781a6434be148a7baeb14e5bc3d55..a075948e5a18babf2c9fdefb5f4ab5bee5875f76 100644
--- a/LCS/Common/src/InputParSet.cc
+++ b/LCS/Common/src/InputParSet.cc
@@ -27,6 +27,12 @@
# include <casa/Inputs/Input.h>
#endif
+// Read input args from command line if given as key=value or as --key value
+// First arg can be parset name
+// Otherwise use default parset name (can be empty)
+// Do this in parset class
+
+
namespace LOFAR {
InputParSet::InputParSet()
diff --git a/LCS/Common/src/ParameterSetImpl.cc b/LCS/Common/src/ParameterSetImpl.cc
index b7e1228120eb8c9d0f078fed428ed8627fcc9feb..a1e751b63b5d969245a093e6e32e3788fd2863ff 100644
--- a/LCS/Common/src/ParameterSetImpl.cc
+++ b/LCS/Common/src/ParameterSetImpl.cc
@@ -104,6 +104,7 @@ ParameterSetImpl::makeSubset(const string& baseKey,
// cut off baseString and copy to subset
pos = subSet->insert(pos, make_pair(prefix + it->first.substr(base.size()),
it->second));
+ itsAskedParms.insert (it->first);
}
return (subSet);
@@ -189,6 +190,18 @@ void ParameterSetImpl::adoptCollection(const ParameterSetImpl& theCollection,
}
}
+void ParameterSetImpl::adoptArgv (int nr, char const * const argv[])
+{
+ for (int i=0; i<nr; ++i) {
+ string arg(argv[i]);
+ // Only add arguments containing an =-sign.
+ string::size_type eqs = arg.find('=');
+ if (eqs != string::npos) {
+ replace (arg.substr(0, eqs), ParameterValue(arg.substr(eqs+1)));
+ }
+ }
+}
+
//
// readFile
// (private)
@@ -326,8 +339,12 @@ ParameterSetImpl::findKV(const string& aKey, bool doThrow) const
const_iterator iter = find(aKey);
- if (iter == end() && doThrow) {
+ if (iter == end()) {
+ if (doThrow) {
THROW (APSException, formatString("Key %s unknown", aKey.c_str()));
+ }
+ } else {
+ itsAskedParms.insert (aKey); \
}
return (iter);
@@ -652,4 +669,15 @@ string ParameterSetImpl::fullModuleName(const string& shortKey) const
return ("");
}
+vector<string> ParameterSetImpl::unusedKeys() const
+{
+ vector<string> vec;
+ for (const_iterator iter = begin(); iter != end(); ++iter) {
+ if (itsAskedParms.find (iter->first) == itsAskedParms.end()) {
+ vec.push_back (iter->first);
+ }
+ }
+ return vec;
+}
+
} // namespace LOFAR
diff --git a/LCS/Common/test/tParameterSet.cc b/LCS/Common/test/tParameterSet.cc
index d473531adabaa049e40cf1a7464274c739b4c38e..d071288f11deae7fddb6cd8bb6383d90dfb28931 100644
--- a/LCS/Common/test/tParameterSet.cc
+++ b/LCS/Common/test/tParameterSet.cc
@@ -1,4 +1,4 @@
-//# tParameterSet.cc: Simple testprogrm to test the ParameterSet class.
+//# tParameterSet.cc: Program to test the ParameterSet class.
//#
//# Copyright (C) 2002-2003
//# ASTRON (Netherlands Institute for Radio Astronomy)
@@ -272,6 +272,33 @@ int doIt(KeyCompare::Mode mode)
return 0;
}
+void testUsed()
+{
+ ParameterSet parset;
+ const char* argv1[] = {"name", "k1=v1", "k2={k2=v2}", "-re"};
+ parset.adoptArgv (4, argv1);
+ ASSERT (parset.getString("k1") == "v1");
+ vector<string> unused = parset.unusedKeys();
+ ASSERT (unused.size()==1 && unused[0]=="k2");
+ ASSERT (parset.getString("k2") == "{k2=v2}");
+ unused = parset.unusedKeys();
+ ASSERT (unused.size()==0);
+ const char* argv2[] = {"s1.k1=v1a", "s1.sk1.k2=v2a"};
+ parset.adoptArgv (2, argv2);
+ unused = parset.unusedKeys();
+ ASSERT (unused.size()==2);
+ // Take a subset and check that such keys are marked as used.
+ ParameterSet subset = parset.makeSubset ("s1.");
+ unused = parset.unusedKeys();
+ // Check the subset.
+ ASSERT (unused.size()==0);
+ unused = subset.unusedKeys();
+ ASSERT (unused.size()==2);
+ ASSERT (subset.getString("k1") == "v1a");
+ ASSERT (subset.getString("sk1.k2") == "v2a");
+ unused = subset.unusedKeys();
+ ASSERT (unused.size()==0);
+}
int main()
{
@@ -279,6 +306,7 @@ int main()
uint fails(0);
fails += doIt(KeyCompare::NORMAL);
fails += doIt(KeyCompare::NOCASE);
+ testUsed();
if (fails > 0) {
cout << fails << " test(s) failed" << endl;
return 1;
diff --git a/LCS/pyparameterset/src/__init__.py b/LCS/pyparameterset/src/__init__.py
index 21d735a9884392cad1095565955152caed45aac5..afcd34c1b54872d59fd027997fa1ec170d174384 100755
--- a/LCS/pyparameterset/src/__init__.py
+++ b/LCS/pyparameterset/src/__init__.py
@@ -137,6 +137,12 @@ class parameterset(PyParameterSet):
d[key] = self.get(key).get()
return d
+ def adoptArgv(self, argv):
+ for arg in argv:
+ kv = arg.split('=', 1)
+ if len(kv) == 2:
+ self.replace (kv[0], kv[1])
+
def get(self, key):
"""Get the parametervalue object of a parameter."""
return parametervalue (self._get(key), _copyObj=True)
diff --git a/LCS/pyparameterset/src/pyparameterset.cc b/LCS/pyparameterset/src/pyparameterset.cc
index aa854e19e9f3eb13142fe12728517dd06b4574bf..20aad23021b650694a8d5a656f5b99d2911aec58 100644
--- a/LCS/pyparameterset/src/pyparameterset.cc
+++ b/LCS/pyparameterset/src/pyparameterset.cc
@@ -274,6 +274,8 @@ namespace LOFAR {
.def ("isDefined", &ParameterSet::isDefined,
(boost::python::arg("key")),
"Does a parameter with the given name exist? ")
+ .def ("unusedKeys", &ParameterSet::unusedKeys,
+ "Get the list of parameter keys not asked for")
.def ("_get", &PyParameterSet::get,
/// return_value_policy < copy_const_reference> (),
(boost::python::arg("key")))