Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix yaml duplicate reaction check #866

Merged
merged 6 commits into from
Jun 30, 2020
Merged

Fix yaml duplicate reaction check #866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
48d0982
[Input] Do full duplicate reaction check for YAML input files
speth Jun 17, 2020
5b76989
[Input] Move shared info from AnyMap and AnyValue to a common base class
speth Jun 17, 2020
85e33d1
[Input] Add constructor for InputFileError that references two nodes
speth Jun 17, 2020
1d51a86
[Kinetics] Provide input file context for errors in reactions
speth Jun 17, 2020
f612cae
[Input] Move all duplicate reaction checking out of ck2yaml
speth Jun 17, 2020
1e1340b
[Input] Add test of mechanism validation when using ck2yaml
speth Jun 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 45 additions & 50 deletions include/cantera/base/AnyMap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,36 @@ class any;
namespace Cantera
{

//! Base class defining common data possessed by both AnyMap and AnyValue
//! objects.
class AnyBase {
public:
AnyBase();
virtual ~AnyBase() {};

//! For values which are derived from an input file, set the line and column
//! of this value in that file. Used for providing context for some error
//! messages.
void setLoc(int line, int column);

//! Get a value from the metadata applicable to the AnyMap tree containing
//! this node.
const AnyValue& getMetadata(const std::string& key) const;

protected:
//! Line where this node occurs in the input file
int m_line;

//! Column where this node occurs in the input file
int m_column;

//! Metadata relevant to an entire AnyMap tree, such as information about
// the input file used to create it
shared_ptr<AnyMap> m_metadata;

friend class InputFileError;
};

class AnyMap;

//! A wrapper for a variable whose type is determined at runtime
Expand All @@ -43,7 +73,7 @@ class AnyMap;
* - `std::string`
* - `std::vector` of any of the above
*/
class AnyValue
class AnyValue : public AnyBase
{
public:
AnyValue();
Expand All @@ -68,15 +98,6 @@ class AnyValue
//! providing informative error messages in class InputFileError.
void setKey(const std::string& key);

//! For values which are derived from an input file, set the line and column
//! of this value in that file. Used for providing context for some error
//! messages.
void setLoc(int line, int column);

//! Get a value from the metadata applicable to the AnyMap tree containing
//! this AnyValue.
const AnyValue& getMetadata(const std::string& key) const;

//! Propagate metadata to any child elements
void propagateMetadata(shared_ptr<AnyMap>& file);

Expand Down Expand Up @@ -209,16 +230,6 @@ class AnyValue
template<class T>
void checkSize(const std::vector<T>& v, size_t nMin, size_t nMax) const;

//! Line where this value occurs in the input file
int m_line;

//! Column where this value occurs in the input file
int m_column;

//! Metadata relevant to an entire AnyMap tree, such as information about
// the input file used to create it
shared_ptr<AnyMap> m_metadata;

//! Key of this value in a parent `AnyMap`
std::string m_key;

Expand Down Expand Up @@ -247,8 +258,6 @@ class AnyValue
static bool vector2_eq(const boost::any& lhs, const boost::any& rhs);

mutable Comparer m_equals;

friend class InputFileError;
};

//! Implicit conversion to vector<AnyValue>
Expand Down Expand Up @@ -347,7 +356,7 @@ std::vector<AnyMap>& AnyValue::asVector<AnyMap>(size_t nMin, size_t nMax);
* }
* ```
*/
class AnyMap
class AnyMap : public AnyBase
{
public:
AnyMap(): m_units() {};
Expand Down Expand Up @@ -385,19 +394,10 @@ class AnyMap
//! messages
std::string keys_str() const;

//! For AnyMaps which are derived from an input file, set the line and
//! column of this AnyMap in that file. Used for providing context for some
//! error messages.
void setLoc(int line, int column);

//! Set a metadata value that applies to this AnyMap and its children.
//! Mainly for internal use in reading or writing from files.
void setMetadata(const std::string& key, const AnyValue& value);

//! Get a value from the metadata applicable to the AnyMap tree containing
//! this AnyMap.
const AnyValue& getMetadata(const std::string& key) const;

//! Propagate metadata to any child elements
void propagateMetadata(shared_ptr<AnyMap>& file);

Expand Down Expand Up @@ -516,23 +516,12 @@ class AnyMap
//! The default units that are used to convert stored values
UnitSystem m_units;

//! Starting line for this map in the input file
int m_line;

//! Starting column for this map in the input file
int m_column;

//! Metadata relevant to an entire AnyMap tree, such as information about
// the input file used to create it
shared_ptr<AnyMap> m_metadata;

//! Cache for previously-parsed input (YAML) files. The key is the full path
//! to the file, and the second element of the value is the last-modified
//! time for the file, which is used to enable change detection.
static std::unordered_map<std::string, std::pair<AnyMap, int>> s_cache;

friend class AnyValue;
friend class InputFileError;
};

// Define begin() and end() to allow use with range-based for loops
Expand All @@ -553,7 +542,7 @@ class InputFileError : public CanteraError
//! `node`. The `message` and `args` are processed as in the CanteraError
//! class.
template <typename... Args>
InputFileError(const std::string& procedure, const AnyValue& node,
InputFileError(const std::string& procedure, const AnyBase& node,
const std::string& message, const Args&... args)
: CanteraError(
procedure,
Expand All @@ -563,25 +552,31 @@ class InputFileError : public CanteraError
}

//! Indicate an error occurring in `procedure` while using information from
//! `node`. The `message` and `args` are processed as in the CanteraError
//! class.
//! `node1` and `node2`. The `message` and `args` are processed as in the
//! CanteraError class.
template <typename... Args>
InputFileError(const std::string& procedure, const AnyMap& node,
const std::string& message, const Args&... args)
InputFileError(const std::string& procedure, const AnyBase& node1,
const AnyBase& node2, const std::string& message,
const Args&... args)
: CanteraError(
procedure,
formatError(fmt::format(message, args...),
node.m_line, node.m_column, node.m_metadata))
formatError2(fmt::format(message, args...),
node1.m_line, node1.m_column, node1.m_metadata,
node2.m_line, node2.m_column, node2.m_metadata))
{
}


virtual std::string getClass() const {
return "InputFileError";
}
protected:
static std::string formatError(const std::string& message,
int line, int column,
const shared_ptr<AnyMap>& metadata);
static std::string formatError2(const std::string& message,
int line1, int column1, const shared_ptr<AnyMap>& metadata1,
int line2, int column2, const shared_ptr<AnyMap>& metadata2);
};

}
Expand Down
Loading