Changeset 1158 for XIOS/dev/dev_olga/src/parse_expr

Timestamp:

06/06/17 17:58:16 (7 years ago)

Author:

oabramkina

Message:

Two server levels: merging with trunk r1137.
There are bugs.

Location:

XIOS/dev/dev_olga/src/parse_expr

Files:

• filter_expr_node.cpp (modified) (3 diffs)
• filter_expr_node.hpp (modified) (1 diff)
• generate_lex_yacc.sh (modified) (1 diff)
• lex_parser.cpp (modified) (43 diffs)
• lex_parser.lex (modified) (1 diff)
• operator_expr.hpp (modified) (11 diffs)
• scalar_expr_node.cpp (modified) (2 diffs)
• scalar_expr_node.hpp (modified) (1 diff)
• yacc_parser.cpp (modified) (17 diffs)
• yacc_parser.hpp (modified) (2 diffs)
• yacc_parser.yacc (modified) (4 diffs)

XIOS/dev/dev_olga/src/parse_expr/filter_expr_node.cpp

@@ -2 +2 @@
 #include "unary_arithmetic_filter.hpp"
 #include "binary_arithmetic_filter.hpp"
+#include "ternary_arithmetic_filter.hpp"
 #include "field.hpp"
 
@@ -40 +41 @@
   boost::shared_ptr<COutputPin> CFilterTemporalFieldExprNode::reduce(CGarbageCollector& gc, CField& thisField) const
   {
-    if (!CField::has(fieldId))
+    boost::shared_ptr<COutputPin> outputPin;
+
+    if (fieldId == "this")
+      outputPin = thisField.getSelfTemporalDataFilter(gc, thisField.freq_op.isEmpty() ? TimeStep : thisField.freq_op);
+    else if (CField::has(fieldId))
+    {
+      CField* field = CField::get(fieldId);
+      if (field == &thisField)
+        ERROR("boost::shared_ptr<COutputPin> CFilterTemporalFieldExprNode::reduce(CGarbageCollector& gc, CField& thisField) const",
+              << "The field " << fieldId << " has an invalid reference to itself. "
+              << "Use the keyword \"this\" if you want to reference the input data sent to this field.");
+
+      field->buildFilterGraph(gc, false);
+      outputPin = field->getTemporalDataFilter(gc, thisField.freq_op.isEmpty() ? TimeStep : thisField.freq_op);
+    }
+    else
       ERROR("boost::shared_ptr<COutputPin> CFilterTemporalFieldExprNode::reduce(CGarbageCollector& gc, CField& thisField) const",
             << "The field " << fieldId << " does not exist.");
 
-    CField* field = CField::get(fieldId);
-    if (field == &thisField)
-      ERROR("boost::shared_ptr<COutputPin> CFilterFieldExprNode::reduce(CGarbageCollector& gc, CField& thisField) const",
-            << "The field " << fieldId << " has an invalid reference to itself.");
-
-    field->buildFilterGraph(gc, false);
-    return field->getTemporalDataFilter(gc, thisField.freq_op.isEmpty() ? TimeStep : thisField.freq_op);
+    return outputPin;
   }
 
@@ -120 +130 @@
     return filter;
   }
+
+
+
+
+  CFilterScalarScalarFieldOpExprNode::CFilterScalarScalarFieldOpExprNode(IScalarExprNode* child1, const std::string& opId, IScalarExprNode* child2, IFilterExprNode* child3)
+    : child1(child1)
+    , opId(opId)
+    , child2(child2)
+    , child3(child3)
+  {
+    if (!child1 || !child2 || !child3)
+      ERROR("  CFilterScalarScalarFieldOpExprNode::CFilterScalarScalarFieldOpExprNode(IScalarExprNode* child1, const std::string& opId, IScalarExprNode* child2, IFilterExprNode* child3)",
+            "Impossible to create the new expression node, an invalid child node was provided.");
+  }
+
+  boost::shared_ptr<COutputPin> CFilterScalarScalarFieldOpExprNode::reduce(CGarbageCollector& gc, CField& thisField) const
+  {
+    boost::shared_ptr<CScalarScalarFieldArithmeticFilter> filter(new CScalarScalarFieldArithmeticFilter(gc, opId, child1->reduce(),child2->reduce()));
+    child3->reduce(gc, thisField)->connectOutput(filter, 0);
+    return filter;
+  }
+
+
+  CFilterScalarFieldScalarOpExprNode::CFilterScalarFieldScalarOpExprNode(IScalarExprNode* child1, const std::string& opId, IFilterExprNode* child2, IScalarExprNode* child3)
+    : child1(child1)
+    , opId(opId)
+    , child2(child2)
+    , child3(child3)
+  {
+    if (!child1 || !child2 || !child3)
+      ERROR("  CFilterScalarFieldScalarOpExprNode::CFilterScalarFieldScalarOpExprNode(IScalarExprNode* child1, const std::string& opId, IFilterExprNode* child2, IScalarExprNode* child3)",
+            "Impossible to create the new expression node, an invalid child node was provided.");
+  }
+
+  boost::shared_ptr<COutputPin> CFilterScalarFieldScalarOpExprNode::reduce(CGarbageCollector& gc, CField& thisField) const
+  {
+    boost::shared_ptr<CScalarFieldScalarArithmeticFilter> filter(new CScalarFieldScalarArithmeticFilter(gc, opId, child1->reduce(),child3->reduce()));
+    child2->reduce(gc, thisField)->connectOutput(filter, 0);
+    return filter;
+  }
+
+
+  CFilterScalarFieldFieldOpExprNode::CFilterScalarFieldFieldOpExprNode(IScalarExprNode* child1, const std::string& opId, IFilterExprNode* child2, IFilterExprNode* child3)
+    : child1(child1)
+    , opId(opId)
+    , child2(child2)
+    , child3(child3)
+  {
+    if (!child1 || !child2 || !child3)
+      ERROR("  CFilterScalarFieldFieldOpExprNode::CFilterScalarFieldFieldOpExprNode(IScalarExprNode* child1, const std::string& opId, IFilterExprNode* child2, IFilterExprNode* child3)",
+            "Impossible to create the new expression node, an invalid child node was provided.");
+  }
+
+  boost::shared_ptr<COutputPin> CFilterScalarFieldFieldOpExprNode::reduce(CGarbageCollector& gc, CField& thisField) const
+  {
+    boost::shared_ptr<CScalarFieldFieldArithmeticFilter> filter(new CScalarFieldFieldArithmeticFilter(gc, opId, child1->reduce()));
+    child2->reduce(gc, thisField)->connectOutput(filter, 0);
+    child3->reduce(gc, thisField)->connectOutput(filter, 1);
+    return filter;
+  }
+
+
+
+  CFilterFieldScalarScalarOpExprNode::CFilterFieldScalarScalarOpExprNode(IFilterExprNode* child1, const std::string& opId, IScalarExprNode* child2, IScalarExprNode* child3)
+    : child1(child1)
+    , opId(opId)
+    , child2(child2)
+    , child3(child3)
+  {
+    if (!child1 || !child2 || !child3)
+      ERROR("  CFilterFieldScalarScalarOpExprNode::CFilterFieldScalarScalarOpExprNode(IFilterExprNode* child1, const std::string& opId, IScalarExprNode* child2, IScalarExprNode* child3)",
+            "Impossible to create the new expression node, an invalid child node was provided.");
+  }
+
+  boost::shared_ptr<COutputPin> CFilterFieldScalarScalarOpExprNode::reduce(CGarbageCollector& gc, CField& thisField) const
+  {
+    boost::shared_ptr<CFieldScalarScalarArithmeticFilter> filter(new CFieldScalarScalarArithmeticFilter(gc, opId, child2->reduce(),child3->reduce()));
+    child1->reduce(gc, thisField)->connectOutput(filter, 0);
+    return filter;
+  }
+
+
+
+  CFilterFieldScalarFieldOpExprNode::CFilterFieldScalarFieldOpExprNode(IFilterExprNode* child1, const std::string& opId, IScalarExprNode* child2, IFilterExprNode* child3)
+    : child1(child1)
+    , opId(opId)
+    , child2(child2)
+    , child3(child3)
+  {
+    if (!child1 || !child2 || !child3)
+      ERROR("  CFilterFieldScalarFieldOpExprNode::CFilterFieldScalarFieldOpExprNode(IFilterExprNode* child1, const std::string& opId, IScalarExprNode* child2, IFilterExprNode* child3)",
+            "Impossible to create the new expression node, an invalid child node was provided.");
+  }
+
+  boost::shared_ptr<COutputPin> CFilterFieldScalarFieldOpExprNode::reduce(CGarbageCollector& gc, CField& thisField) const
+  {
+    boost::shared_ptr<CFieldScalarFieldArithmeticFilter> filter(new CFieldScalarFieldArithmeticFilter(gc, opId, child2->reduce()));
+    child1->reduce(gc, thisField)->connectOutput(filter, 0);
+    child3->reduce(gc, thisField)->connectOutput(filter, 1);
+    return filter;
+  }
+
+
+
+  CFilterFieldFieldScalarOpExprNode::CFilterFieldFieldScalarOpExprNode(IFilterExprNode* child1, const std::string& opId, IFilterExprNode* child2, IScalarExprNode* child3)
+    : child1(child1)
+    , opId(opId)
+    , child2(child2)
+    , child3(child3)
+  {
+    if (!child1 || !child2 || !child3)
+      ERROR("  CFilterFieldFieldScalarOpExprNode::CFilterFieldFieldScalarOpExprNode(IFilterExprNode* child1, const std::string& opId, IFilterExprNode* child2, IScalarExprNode* child3)",
+            "Impossible to create the new expression node, an invalid child node was provided.");
+  }
+
+  boost::shared_ptr<COutputPin> CFilterFieldFieldScalarOpExprNode::reduce(CGarbageCollector& gc, CField& thisField) const
+  {
+    boost::shared_ptr<CFieldFieldScalarArithmeticFilter> filter(new CFieldFieldScalarArithmeticFilter(gc, opId, child3->reduce()));
+    child1->reduce(gc, thisField)->connectOutput(filter, 0);
+    child2->reduce(gc, thisField)->connectOutput(filter, 1);
+    return filter;
+  }
+
+
+  CFilterFieldFieldFieldOpExprNode::CFilterFieldFieldFieldOpExprNode(IFilterExprNode* child1, const std::string& opId, IFilterExprNode* child2, IFilterExprNode* child3)
+    : child1(child1)
+    , opId(opId)
+    , child2(child2)
+    , child3(child3)
+  {
+    if (!child1 || !child2 || !child3)
+      ERROR("  CFilterFieldFieldFieldOpExprNode::CFilterFieldFieldFieldOpExprNode(IFilterExprNode* child1, const std::string& opId, IFilterExprNode* child2, IFilterExprNode* child3)",
+            "Impossible to create the new expression node, an invalid child node was provided.");
+  }
+
+  boost::shared_ptr<COutputPin> CFilterFieldFieldFieldOpExprNode::reduce(CGarbageCollector& gc, CField& thisField) const
+  {
+    boost::shared_ptr<CFieldFieldFieldArithmeticFilter> filter(new CFieldFieldFieldArithmeticFilter(gc, opId));
+    child1->reduce(gc, thisField)->connectOutput(filter, 0);
+    child2->reduce(gc, thisField)->connectOutput(filter, 1);
+    child3->reduce(gc, thisField)->connectOutput(filter, 2);
+    return filter;
+  }
+  
 }

XIOS/dev/dev_olga/src/parse_expr/filter_expr_node.hpp

@@ -169 +169 @@
       boost::scoped_ptr<IFilterExprNode> child1, child2; //!< The field child nodes to which the operator is applied
   };
+
+
+
+ /*!
+   * Expression node corresponding to a ternary operation on a scalar-scalar-field.
+   */
+  class CFilterScalarScalarFieldOpExprNode : public IFilterExprNode
+  {
+    public:
+      /*!
+       * Constructs an expression node corresponding to the specified ternary operation
+       * applied to the provided fields and scalars child nodes.
+       * Note that the child nodes will be destroyed automatically when the parent node
+       * is destroyed.
+       *
+       * \param child1 the scalar child node to which the operator is applied
+       * \param opId the identifier of the operator
+       * \param child2 the scalar child node to which the operator is applied
+       * \param child3 the field child node to which the operator is applied
+      */
+      CFilterScalarScalarFieldOpExprNode(IScalarExprNode* child1, const std::string& opId, IScalarExprNode* child2, IFilterExprNode* child3);
+
+      virtual boost::shared_ptr<COutputPin> reduce(CGarbageCollector& gc, CField& thisField) const;
+
+    private:
+      std::string opId; //!< The identifier of the field
+      boost::scoped_ptr<IScalarExprNode> child1; //!< The scalar child node to which the operator is applied
+      boost::scoped_ptr<IScalarExprNode> child2; //!< The scalar child node to which the operator is applied
+      boost::scoped_ptr<IFilterExprNode> child3; //!< The field child node to which the operator is applied
+  };
+
+
+  /*!
+   * Expression node corresponding to a ternary operation on a scalar-field-scalar.
+   */
+  class CFilterScalarFieldScalarOpExprNode : public IFilterExprNode
+  {
+    public:
+      /*!
+       * Constructs an expression node corresponding to the specified ternary operation
+       * applied to the provided fields and scalars child nodes.
+       * Note that the child nodes will be destroyed automatically when the parent node
+       * is destroyed.
+       *
+       * \param child1 the scalar child node to which the operator is applied
+       * \param opId the identifier of the operator
+       * \param child2 the field child node to which the operator is applied
+       * \param child3 the scalar child node to which the operator is applied
+      */
+      CFilterScalarFieldScalarOpExprNode(IScalarExprNode* child1, const std::string& opId, IFilterExprNode* child2, IScalarExprNode* child3);
+
+      virtual boost::shared_ptr<COutputPin> reduce(CGarbageCollector& gc, CField& thisField) const;
+
+    private:
+      std::string opId; //!< The identifier of the field
+      boost::scoped_ptr<IScalarExprNode> child1; //!< The scalar child node to which the operator is applied
+      boost::scoped_ptr<IFilterExprNode> child2; //!< The field child node to which the operator is applied
+      boost::scoped_ptr<IScalarExprNode> child3; //!< The scalar child node to which the operator is applied
+  };
+
+
+  /*!
+   * Expression node corresponding to a ternary operation on a scalar-field-field.
+   */
+  class CFilterScalarFieldFieldOpExprNode : public IFilterExprNode
+  {
+    public:
+      /*!
+       * Constructs an expression node corresponding to the specified ternary operation
+       * applied to the provided fields and scalars child nodes.
+       * Note that the child nodes will be destroyed automatically when the parent node
+       * is destroyed.
+       *
+       * \param child1 the scalar child node to which the operator is applied
+       * \param opId the identifier of the operator
+       * \param child2 the field child node to which the operator is applied
+       * \param child3 the field child node to which the operator is applied
+      */
+      CFilterScalarFieldFieldOpExprNode(IScalarExprNode* child1, const std::string& opId, IFilterExprNode* child2, IFilterExprNode* child3);
+
+      virtual boost::shared_ptr<COutputPin> reduce(CGarbageCollector& gc, CField& thisField) const;
+
+    private:
+      std::string opId; //!< The identifier of the field
+      boost::scoped_ptr<IScalarExprNode> child1; //!< The scalar child node to which the operator is applied
+      boost::scoped_ptr<IFilterExprNode> child2; //!< The field child node to which the operator is applied
+      boost::scoped_ptr<IFilterExprNode> child3; //!< The field child node to which the operator is applied
+  };
+
+
+
+/*!
+   * Expression node corresponding to a ternary operation on a field-scalar-scalar.
+   */
+  class CFilterFieldScalarScalarOpExprNode : public IFilterExprNode
+  {
+    public:
+      /*!
+       * Constructs an expression node corresponding to the specified ternary operation
+       * applied to the provided fields and scalars child nodes.
+       * Note that the child nodes will be destroyed automatically when the parent node
+       * is destroyed.
+       *
+       * \param child1 the field child node to which the operator is applied
+       * \param opId the identifier of the operator
+       * \param child2 the scalar child node to which the operator is applied
+       * \param child3 the scalar child node to which the operator is applied
+      */
+      CFilterFieldScalarScalarOpExprNode(IFilterExprNode* child1, const std::string& opId, IScalarExprNode* child2, IScalarExprNode* child3);
+
+      virtual boost::shared_ptr<COutputPin> reduce(CGarbageCollector& gc, CField& thisField) const;
+
+    private:
+      std::string opId; //!< The identifier of the field
+      boost::scoped_ptr<IFilterExprNode> child1; //!< The field child node to which the operator is applied
+      boost::scoped_ptr<IScalarExprNode> child2; //!< The scalar child node to which the operator is applied
+      boost::scoped_ptr<IScalarExprNode> child3; //!< The scalar child node to which the operator is applied
+  };
+
+
+/*!
+   * Expression node corresponding to a ternary operation on a field-scalar-field.
+   */
+  class CFilterFieldScalarFieldOpExprNode : public IFilterExprNode
+  {
+    public:
+      /*!
+       * Constructs an expression node corresponding to the specified ternary operation
+       * applied to the provided fields and scalars child nodes.
+       * Note that the child nodes will be destroyed automatically when the parent node
+       * is destroyed.
+       *
+       * \param child1 the field child node to which the operator is applied
+       * \param opId the identifier of the operator
+       * \param child2 the scalar child node to which the operator is applied
+       * \param child3 the field child node to which the operator is applied
+      */
+      CFilterFieldScalarFieldOpExprNode(IFilterExprNode* child1, const std::string& opId, IScalarExprNode* child2, IFilterExprNode* child3);
+
+      virtual boost::shared_ptr<COutputPin> reduce(CGarbageCollector& gc, CField& thisField) const;
+
+    private:
+      std::string opId; //!< The identifier of the field
+      boost::scoped_ptr<IFilterExprNode> child1; //!< The field child node to which the operator is applied
+      boost::scoped_ptr<IScalarExprNode> child2; //!< The scalar child node to which the operator is applied
+      boost::scoped_ptr<IFilterExprNode> child3; //!< The field child node to which the operator is applied
+  };
+
+  /*!
+   * Expression node corresponding to a ternary operation on a field-field-scalar.
+   */
+  class CFilterFieldFieldScalarOpExprNode : public IFilterExprNode
+  {
+    public:
+      /*!
+       * Constructs an expression node corresponding to the specified ternary operation
+       * applied to the provided fields and scalars child nodes.
+       * Note that the child nodes will be destroyed automatically when the parent node
+       * is destroyed.
+       *
+       * \param child1 the field child node to which the operator is applied
+       * \param opId the identifier of the operator
+       * \param child2 the field child node to which the operator is applied
+       * \param child3 the scalar child node to which the operator is applied
+      */
+      CFilterFieldFieldScalarOpExprNode(IFilterExprNode* child1, const std::string& opId, IFilterExprNode* child2, IScalarExprNode* child3);
+
+      virtual boost::shared_ptr<COutputPin> reduce(CGarbageCollector& gc, CField& thisField) const;
+
+    private:
+      std::string opId; //!< The identifier of the field
+      boost::scoped_ptr<IFilterExprNode> child1; //!< The field child node to which the operator is applied
+      boost::scoped_ptr<IFilterExprNode> child2; //!< The field child node to which the operator is applied
+      boost::scoped_ptr<IScalarExprNode> child3; //!< The scalar child node to which the operator is applied
+  };
+
+
+  /*!
+   * Expression node corresponding to a ternary operation on a field-field-field.
+   */
+  class CFilterFieldFieldFieldOpExprNode : public IFilterExprNode
+  {
+    public:
+      /*!
+       * Constructs an expression node corresponding to the specified ternary operation
+       * applied to the provided fields and scalars child nodes.
+       * Note that the child nodes will be destroyed automatically when the parent node
+       * is destroyed.
+       *
+       * \param child1 the field child node to which the operator is applied
+       * \param opId the identifier of the operator
+       * \param child2 the field child node to which the operator is applied
+       * \param child3 the field child node to which the operator is applied
+      */
+      CFilterFieldFieldFieldOpExprNode(IFilterExprNode* child1, const std::string& opId, IFilterExprNode* child2, IFilterExprNode* child3);
+
+      virtual boost::shared_ptr<COutputPin> reduce(CGarbageCollector& gc, CField& thisField) const;
+
+    private:
+      std::string opId; //!< The identifier of the field
+      boost::scoped_ptr<IFilterExprNode> child1; //!< The field child node to which the operator is applied
+      boost::scoped_ptr<IFilterExprNode> child2; //!< The field child node to which the operator is applied
+      boost::scoped_ptr<IFilterExprNode> child3; //!< The field child node to which the operator is applied
+  };
+
+
+
 }
 

XIOS/dev/dev_olga/src/parse_expr/generate_lex_yacc.sh

@@ -1 @@
-bison -d yacc_parser.yacc -o yacc_parser.cpp
+bison --verbose -d yacc_parser.yacc -o yacc_parser.cpp
 flex -o lex_parser.cpp -f lex_parser.lex 

XIOS/dev/dev_olga/src/parse_expr/lex_parser.cpp

@@ -10 +10 @@
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 39
+#define YY_FLEX_SUBMINOR_VERSION 37
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
@@ -143 +143 @@
 /* Size of default input buffer. */
 #ifndef YY_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k.
- * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
- * Ditto for the __ia64__ case accordingly.
- */
-#define YY_BUF_SIZE 32768
-#else
 #define YY_BUF_SIZE 16384
-#endif /* __ia64__ */
 #endif
 
@@ -177 +169 @@
 
     #define YY_LESS_LINENO(n)
-    #define YY_LINENO_REWIND_TO(ptr)
     
 /* Return all but the first "n" matched characters back to the input stream. */
@@ -356 +347 @@
 extern char *yytext;
 #define yytext_ptr yytext
-
 static yyconst flex_int16_t yy_nxt[][128] =
     {
@@ -382 +372 @@
         4,    4,    5,    4,    4,    4,    6,    4,    4,    4,
         7,    8,    9,   10,    4,   11,    4,   12,   13,   13,
-       13,   13,   13,   13,   13,   13,   13,   13,    4,    4,
-       14,   15,   16,    4,   17,   18,   18,   18,   18,   18,
-
-       18,   18,   18,   18,   18,   18,   18,   18,   18,   18,
-       18,   18,   18,   18,   18,   18,   18,   18,   18,   18,
-       18,    4,    4,    4,   19,    4,    4,   18,   18,   18,
-       18,   18,   18,   18,   18,   18,   18,   18,   18,   18,
-       18,   18,   18,   18,   18,   18,   18,   18,   18,   18,
-       18,   18,   18,    4,    4,    4,    4,    4
+       13,   13,   13,   13,   13,   13,   13,   13,   14,    4,
+       15,   16,   17,   18,   19,   20,   20,   20,   20,   20,
+
+       20,   20,   20,   20,   20,   20,   20,   20,   20,   20,
+       20,   20,   20,   20,   20,   20,   20,   20,   20,   20,
+       20,    4,    4,    4,   21,    4,    4,   20,   20,   20,
+       20,   20,   20,   20,   20,   20,   20,   20,   20,   20,
+       20,   20,   20,   20,   20,   20,   20,   20,   20,   20,
+       20,   20,   20,    4,    4,    4,    4,    4
     },
 
@@ -400 +390 @@
 
         7,    8,    9,   10,    4,   11,    4,   12,   13,   13,
-       13,   13,   13,   13,   13,   13,   13,   13,    4,    4,
-       14,   15,   16,    4,   17,   18,   18,   18,   18,   18,
-       18,   18,   18,   18,   18,   18,   18,   18,   18,   18,
-       18,   18,   18,   18,   18,   18,   18,   18,   18,   18,
-       18,    4,    4,    4,   19,    4,    4,   18,   18,   18,
-       18,   18,   18,   18,   18,   18,   18,   18,   18,   18,
-       18,   18,   18,   18,   18,   18,   18,   18,   18,   18,
-       18,   18,   18,    4,    4,    4,    4,    4
+       13,   13,   13,   13,   13,   13,   13,   13,   14,    4,
+       15,   16,   17,   18,   19,   20,   20,   20,   20,   20,
+       20,   20,   20,   20,   20,   20,   20,   20,   20,   20,
+       20,   20,   20,   20,   20,   20,   20,   20,   20,   20,
+       20,    4,    4,    4,   21,    4,    4,   20,   20,   20,
+       20,   20,   20,   20,   20,   20,   20,   20,   20,   20,
+       20,   20,   20,   20,   20,   20,   20,   20,   20,   20,
+       20,   20,   20,    4,    4,    4,    4,    4
     },
 
@@ -446 +436 @@
 
     {
-        3,   -5,   -5,   -5,   -5,   -5,   -5,   -5,   -5,   21,
+        3,   -5,   -5,   -5,   -5,   -5,   -5,   -5,   -5,   23,
        -5,   -5,   -5,   -5,   -5,   -5,   -5,   -5,   -5,   -5,
        -5,   -5,   -5,   -5,   -5,   -5,   -5,   -5,   -5,   -5,
-       -5,   -5,   21,   -5,   -5,   -5,   -5,   -5,   -5,   -5,
+       -5,   -5,   23,   -5,   -5,   -5,   -5,   -5,   -5,   -5,
        -5,   -5,   -5,   -5,   -5,   -5,   -5,   -5,   -5,   -5,
 
@@ -470 +460 @@
        -6,   -6,   -6,   -6,   -6,   -6,   -6,   -6,   -6,   -6,
        -6,   -6,   -6,   -6,   -6,   -6,   -6,   -6,   -6,   -6,
-       -6,   -6,   -6,   -6,   -6,   22,   22,   22,   22,   22,
-       22,   22,   22,   22,   22,   22,   22,   22,   22,   22,
-       22,   22,   22,   22,   22,   22,   22,   22,   22,   22,
-       22,   -6,   -6,   -6,   -6,   -6,   -6,   22,   22,   22,
-       22,   22,   22,   22,   22,   22,   22,   22,   22,   22,
-       22,   22,   22,   22,   22,   22,   22,   22,   22,   22,
-
-       22,   22,   22,   -6,   -6,   -6,   -6,   -6
+       -6,   -6,   -6,   -6,   -6,   24,   24,   24,   24,   24,
+       24,   24,   24,   24,   24,   24,   24,   24,   24,   24,
+       24,   24,   24,   24,   24,   24,   24,   24,   24,   24,
+       24,   -6,   -6,   -6,   -6,   -6,   -6,   24,   24,   24,
+       24,   24,   24,   24,   24,   24,   24,   24,   24,   24,
+       24,   24,   24,   24,   24,   24,   24,   24,   24,   24,
+
+       24,   24,   24,   -6,   -6,   -6,   -6,   -6
     },
 
@@ -574 +564 @@
       -12,  -12,  -12,  -12,  -12,  -12,  -12,  -12,  -12,  -12,
       -12,  -12,  -12,  -12,  -12,  -12,  -12,  -12,  -12,  -12,
-      -12,  -12,  -12,  -12,  -12,  -12,  -12,  -12,  -12,  -12,
+      -12,   25,  -12,  -12,  -12,  -12,  -12,  -12,  -12,  -12,
       -12,  -12,  -12,  -12,  -12,  -12,  -12,  -12,  -12,  -12,
       -12,  -12,  -12,  -12,  -12,  -12,  -12,  -12,  -12,  -12,
@@ -589 +579 @@
       -13,  -13,  -13,  -13,  -13,  -13,  -13,  -13,  -13,  -13,
       -13,  -13,  -13,  -13,  -13,  -13,  -13,  -13,  -13,  -13,
-      -13,  -13,  -13,  -13,  -13,  -13,   23,  -13,   24,   24,
-       24,   24,   24,   24,   24,   24,   24,   24,  -13,  -13,
-      -13,  -13,  -13,  -13,  -13,  -13,  -13,  -13,  -13,   25,
+      -13,  -13,  -13,  -13,  -13,  -13,   26,  -13,   27,   27,
+       27,   27,   27,   27,   27,   27,   27,   27,  -13,  -13,
+      -13,  -13,  -13,  -13,  -13,  -13,  -13,  -13,  -13,   28,
       -13,  -13,  -13,  -13,  -13,  -13,  -13,  -13,  -13,  -13,
       -13,  -13,  -13,  -13,  -13,  -13,  -13,  -13,  -13,  -13,
       -13,  -13,  -13,  -13,  -13,  -13,  -13,  -13,  -13,  -13,
-      -13,   25,  -13,  -13,  -13,  -13,  -13,  -13,  -13,  -13,
+      -13,   28,  -13,  -13,  -13,  -13,  -13,  -13,  -13,  -13,
 
       -13,  -13,  -13,  -13,  -13,  -13,  -13,  -13,  -13,  -13,
@@ -608 +598 @@
       -14,  -14,  -14,  -14,  -14,  -14,  -14,  -14,  -14,  -14,
       -14,  -14,  -14,  -14,  -14,  -14,  -14,  -14,  -14,  -14,
-      -14,   26,  -14,  -14,  -14,  -14,  -14,  -14,  -14,  -14,
+      -14,  -14,  -14,  -14,  -14,  -14,  -14,  -14,  -14,  -14,
       -14,  -14,  -14,  -14,  -14,  -14,  -14,  -14,  -14,  -14,
 
@@ -626 +616 @@
 
       -15,  -15,  -15,  -15,  -15,  -15,  -15,  -15,  -15,  -15,
-      -15,   27,  -15,  -15,  -15,  -15,  -15,  -15,  -15,  -15,
+      -15,   29,  -15,  -15,  -15,  -15,  -15,  -15,  -15,  -15,
       -15,  -15,  -15,  -15,  -15,  -15,  -15,  -15,  -15,  -15,
       -15,  -15,  -15,  -15,  -15,  -15,  -15,  -15,  -15,  -15,
@@ -643 +633 @@
       -16,  -16,  -16,  -16,  -16,  -16,  -16,  -16,  -16,  -16,
       -16,  -16,  -16,  -16,  -16,  -16,  -16,  -16,  -16,  -16,
-      -16,   28,  -16,  -16,  -16,  -16,  -16,  -16,  -16,  -16,
+      -16,   30,  -16,  -16,  -16,  -16,  -16,  -16,  -16,  -16,
       -16,  -16,  -16,  -16,  -16,  -16,  -16,  -16,  -16,  -16,
       -16,  -16,  -16,  -16,  -16,  -16,  -16,  -16,  -16,  -16,
@@ -660 +650 @@
       -17,  -17,  -17,  -17,  -17,  -17,  -17,  -17,  -17,  -17,
       -17,  -17,  -17,  -17,  -17,  -17,  -17,  -17,  -17,  -17,
-      -17,  -17,  -17,  -17,  -17,   29,   29,   29,   29,   29,
-       29,   29,   29,   29,   29,   29,   29,   29,   29,   29,
-       29,   29,   29,   29,   29,   29,   29,   29,   29,   29,
-
-       29,  -17,  -17,  -17,  -17,  -17,  -17,   29,   29,   29,
-       29,   29,   29,   29,   29,   29,   29,   29,   29,   29,
-       29,   29,   29,   29,   29,   29,   29,   29,   29,   29,
-       29,   29,   29,  -17,  -17,  -17,  -17,  -17
+      -17,   31,  -17,  -17,  -17,  -17,  -17,  -17,  -17,  -17,
+      -17,  -17,  -17,  -17,  -17,  -17,  -17,  -17,  -17,  -17,
+      -17,  -17,  -17,  -17,  -17,  -17,  -17,  -17,  -17,  -17,
+
+      -17,  -17,  -17,  -17,  -17,  -17,  -17,  -17,  -17,  -17,
+      -17,  -17,  -17,  -17,  -17,  -17,  -17,  -17,  -17,  -17,
+      -17,  -17,  -17,  -17,  -17,  -17,  -17,  -17,  -17,  -17,
+      -17,  -17,  -17,  -17,  -17,  -17,  -17,  -17
     },
 
@@ -675 +665 @@
       -18,  -18,  -18,  -18,  -18,  -18,  -18,  -18,  -18,  -18,
       -18,  -18,  -18,  -18,  -18,  -18,  -18,  -18,  -18,  -18,
-      -18,  -18,  -18,  -18,  -18,  -18,  -18,  -18,   30,   30,
-       30,   30,   30,   30,   30,   30,   30,   30,  -18,  -18,
-
-      -18,  -18,  -18,  -18,  -18,   30,   30,   30,   30,   30,
-       30,   30,   30,   30,   30,   30,   30,   30,   30,   30,
-       30,   30,   30,   30,   30,   30,   30,   30,   30,   30,
-       30,  -18,  -18,  -18,  -18,   30,  -18,   30,   30,   30,
-       30,   30,   30,   30,   30,   30,   30,   30,   30,   30,
-       30,   30,   30,   30,   30,   30,   30,   30,   30,   30,
-       30,   30,   30,  -18,  -18,  -18,  -18,  -18
+      -18,  -18,  -18,  -18,  -18,  -18,  -18,  -18,  -18,  -18,
+      -18,  -18,  -18,  -18,  -18,  -18,  -18,  -18,  -18,  -18,
+
+      -18,  -18,  -18,  -18,  -18,  -18,  -18,  -18,  -18,  -18,
+      -18,  -18,  -18,  -18,  -18,  -18,  -18,  -18,  -18,  -18,
+      -18,  -18,  -18,  -18,  -18,  -18,  -18,  -18,  -18,  -18,
+      -18,  -18,  -18,  -18,  -18,  -18,  -18,  -18,  -18,  -18,
+      -18,  -18,  -18,  -18,  -18,  -18,  -18,  -18,  -18,  -18,
+      -18,  -18,  -18,  -18,  -18,  -18,  -18,  -18,  -18,  -18,
+      -18,  -18,  -18,  -18,  -18,  -18,  -18,  -18
     },
 
@@ -695 +685 @@
       -19,  -19,  -19,  -19,  -19,  -19,  -19,  -19,  -19,  -19,
       -19,  -19,  -19,  -19,  -19,  -19,  -19,  -19,  -19,  -19,
-      -19,  -19,  -19,  -19,  -19,  -19,  -19,  -19,  -19,  -19,
-      -19,  -19,  -19,  -19,  -19,  -19,  -19,  -19,  -19,  -19,
-      -19,  -19,  -19,  -19,  -19,  -19,  -19,  -19,  -19,  -19,
-      -19,  -19,  -19,  -19,  -19,  -19,  -19,  -19,  -19,  -19,
-      -19,  -19,  -19,  -19,  -19,  -19,  -19,  -19,  -19,  -19,
-      -19,  -19,  -19,  -19,  -19,  -19,  -19,  -19,  -19,  -19,
-      -19,  -19,  -19,  -19,  -19,  -19,  -19,  -19
+      -19,  -19,  -19,  -19,  -19,   32,   32,   32,   32,   32,
+       32,   32,   32,   32,   32,   32,   32,   32,   32,   32,
+       32,   32,   32,   32,   32,   32,   32,   32,   32,   32,
+       32,  -19,  -19,  -19,  -19,  -19,  -19,   32,   32,   32,
+       32,   32,   32,   32,   32,   32,   32,   32,   32,   32,
+       32,   32,   32,   32,   32,   32,   32,   32,   32,   32,
+       32,   32,   32,  -19,  -19,  -19,  -19,  -19
 
     },
@@ -710 +700 @@
       -20,  -20,  -20,  -20,  -20,  -20,  -20,  -20,  -20,  -20,
       -20,  -20,  -20,  -20,  -20,  -20,  -20,  -20,  -20,  -20,
-      -20,  -20,  -20,  -20,  -20,  -20,  -20,  -20,  -20,  -20,
-      -20,  -20,  -20,  -20,  -20,  -20,  -20,  -20,  -20,  -20,
-      -20,  -20,  -20,  -20,  -20,  -20,  -20,  -20,  -20,  -20,
-      -20,  -20,  -20,  -20,  -20,  -20,  -20,  -20,  -20,  -20,
-      -20,  -20,  -20,  -20,  -20,  -20,  -20,  -20,  -20,  -20,
-      -20,  -20,  -20,  -20,  -20,  -20,  -20,  -20,  -20,  -20,
-
-      -20,  -20,  -20,  -20,  -20,  -20,  -20,  -20,  -20,  -20,
-      -20,  -20,  -20,  -20,  -20,  -20,  -20,  -20,  -20,  -20,
-      -20,  -20,  -20,  -20,  -20,  -20,  -20,  -20
-    },
-
-    {
-        3,  -21,  -21,  -21,  -21,  -21,  -21,  -21,  -21,   21,
+      -20,  -20,  -20,  -20,  -20,  -20,  -20,  -20,   33,   33,
+       33,   33,   33,   33,   33,   33,   33,   33,  -20,  -20,
+      -20,  -20,  -20,  -20,  -20,   33,   33,   33,   33,   33,
+       33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
+       33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
+       33,  -20,  -20,  -20,  -20,   33,  -20,   33,   33,   33,
+
+       33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
+       33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
+       33,   33,   33,  -20,  -20,  -20,  -20,  -20
+    },
+
+    {
+        3,  -21,  -21,  -21,  -21,  -21,  -21,  -21,  -21,  -21,
       -21,  -21,  -21,  -21,  -21,  -21,  -21,  -21,  -21,  -21,
       -21,  -21,  -21,  -21,  -21,  -21,  -21,  -21,  -21,  -21,
-      -21,  -21,   21,  -21,  -21,  -21,  -21,  -21,  -21,  -21,
+      -21,  -21,  -21,  -21,  -21,  -21,  -21,  -21,  -21,  -21,
       -21,  -21,  -21,  -21,  -21,  -21,  -21,  -21,  -21,  -21,
       -21,  -21,  -21,  -21,  -21,  -21,  -21,  -21,  -21,  -21,
@@ -745 +735 @@
       -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,
 
-      -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,   31,   31,
-       31,   31,   31,   31,   31,   31,   31,   31,  -22,  -22,
-      -22,  -22,  -22,  -22,  -22,   31,   31,   31,   31,   31,
-       31,   31,   31,   31,   31,   31,   31,   31,   31,   31,
-       31,   31,   31,   31,   31,   31,   31,   31,   31,   31,
-       31,  -22,  -22,  -22,  -22,   31,  -22,   31,   31,   31,
-       31,   31,   31,   31,   31,   31,   31,   31,   31,   31,
-       31,   31,   31,   31,   31,   31,   31,   31,   31,   31,
-       31,   31,   31,  -22,  -22,  -22,  -22,  -22
-    },
-
-    {
-        3,  -23,  -23,  -23,  -23,  -23,  -23,  -23,  -23,  -23,
+      -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,
+      -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,
+      -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,
+      -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,
+      -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,
+      -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,
+      -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,
+      -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22,
+      -22,  -22,  -22,  -22,  -22,  -22,  -22,  -22
+    },
+
+    {
+        3,  -23,  -23,  -23,  -23,  -23,  -23,  -23,  -23,   23,
 
       -23,  -23,  -23,  -23,  -23,  -23,  -23,  -23,  -23,  -23,
       -23,  -23,  -23,  -23,  -23,  -23,  -23,  -23,  -23,  -23,
-      -23,  -23,  -23,  -23,  -23,  -23,  -23,  -23,  -23,  -23,
-      -23,  -23,  -23,  -23,  -23,  -23,  -23,  -23,   32,   32,
-       32,   32,   32,   32,   32,   32,   32,   32,  -23,  -23,
+      -23,  -23,   23,  -23,  -23,  -23,  -23,  -23,  -23,  -23,
       -23,  -23,  -23,  -23,  -23,  -23,  -23,  -23,  -23,  -23,
       -23,  -23,  -23,  -23,  -23,  -23,  -23,  -23,  -23,  -23,
@@ -769 +757 @@
       -23,  -23,  -23,  -23,  -23,  -23,  -23,  -23,  -23,  -23,
       -23,  -23,  -23,  -23,  -23,  -23,  -23,  -23,  -23,  -23,
+      -23,  -23,  -23,  -23,  -23,  -23,  -23,  -23,  -23,  -23,
+      -23,  -23,  -23,  -23,  -23,  -23,  -23,  -23,  -23,  -23,
 
       -23,  -23,  -23,  -23,  -23,  -23,  -23,  -23,  -23,  -23,
@@ -779 +769 @@
       -24,  -24,  -24,  -24,  -24,  -24,  -24,  -24,  -24,  -24,
       -24,  -24,  -24,  -24,  -24,  -24,  -24,  -24,  -24,  -24,
-      -24,  -24,  -24,  -24,  -24,  -24,   23,  -24,   24,   24,
-       24,   24,   24,   24,   24,   24,   24,   24,  -24,  -24,
-      -24,  -24,  -24,  -24,  -24,  -24,  -24,  -24,  -24,   25,
-      -24,  -24,  -24,  -24,  -24,  -24,  -24,  -24,  -24,  -24,
-
-      -24,  -24,  -24,  -24,  -24,  -24,  -24,  -24,  -24,  -24,
-      -24,  -24,  -24,  -24,  -24,  -24,  -24,  -24,  -24,  -24,
-      -24,   25,  -24,  -24,  -24,  -24,  -24,  -24,  -24,  -24,
-      -24,  -24,  -24,  -24,  -24,  -24,  -24,  -24,  -24,  -24,
-      -24,  -24,  -24,  -24,  -24,  -24,  -24,  -24
+      -24,  -24,  -24,  -24,  -24,  -24,  -24,  -24,   34,   34,
+       34,   34,   34,   34,   34,   34,   34,   34,  -24,  -24,
+      -24,  -24,  -24,  -24,  -24,   34,   34,   34,   34,   34,
+       34,   34,   34,   34,   34,   34,   34,   34,   34,   34,
+
+       34,   34,   34,   34,   34,   34,   34,   34,   34,   34,
+       34,  -24,  -24,  -24,  -24,   34,  -24,   34,   34,   34,
+       34,   34,   34,   34,   34,   34,   34,   34,   34,   34,
+       34,   34,   34,   34,   34,   34,   34,   34,   34,   34,
+       34,   34,   34,  -24,  -24,  -24,  -24,  -24
     },
 
@@ -796 +786 @@
       -25,  -25,  -25,  -25,  -25,  -25,  -25,  -25,  -25,  -25,
       -25,  -25,  -25,  -25,  -25,  -25,  -25,  -25,  -25,  -25,
-      -25,  -25,  -25,   33,  -25,   33,  -25,  -25,   34,   34,
-
-       34,   34,   34,   34,   34,   34,   34,   34,  -25,  -25,
+      -25,  -25,  -25,  -25,  -25,  -25,  -25,  -25,  -25,  -25,
+
+      -25,  -25,  -25,  -25,  -25,  -25,  -25,  -25,  -25,  -25,
       -25,  -25,  -25,  -25,  -25,  -25,  -25,  -25,  -25,  -25,
       -25,  -25,  -25,  -25,  -25,  -25,  -25,  -25,  -25,  -25,
@@ -814 +804 @@
       -26,  -26,  -26,  -26,  -26,  -26,  -26,  -26,  -26,  -26,
       -26,  -26,  -26,  -26,  -26,  -26,  -26,  -26,  -26,  -26,
+      -26,  -26,  -26,  -26,  -26,  -26,  -26,  -26,   35,   35,
+       35,   35,   35,   35,   35,   35,   35,   35,  -26,  -26,
       -26,  -26,  -26,  -26,  -26,  -26,  -26,  -26,  -26,  -26,
       -26,  -26,  -26,  -26,  -26,  -26,  -26,  -26,  -26,  -26,
@@ -820 +812 @@
       -26,  -26,  -26,  -26,  -26,  -26,  -26,  -26,  -26,  -26,
       -26,  -26,  -26,  -26,  -26,  -26,  -26,  -26,  -26,  -26,
-      -26,  -26,  -26,  -26,  -26,  -26,  -26,  -26,  -26,  -26,
-      -26,  -26,  -26,  -26,  -26,  -26,  -26,  -26,  -26,  -26,
 
       -26,  -26,  -26,  -26,  -26,  -26,  -26,  -26
@@ -831 +821 @@
       -27,  -27,  -27,  -27,  -27,  -27,  -27,  -27,  -27,  -27,
       -27,  -27,  -27,  -27,  -27,  -27,  -27,  -27,  -27,  -27,
+      -27,  -27,  -27,  -27,  -27,  -27,   26,  -27,   27,   27,
+       27,   27,   27,   27,   27,   27,   27,   27,  -27,  -27,
+      -27,  -27,  -27,  -27,  -27,  -27,  -27,  -27,  -27,   28,
       -27,  -27,  -27,  -27,  -27,  -27,  -27,  -27,  -27,  -27,
       -27,  -27,  -27,  -27,  -27,  -27,  -27,  -27,  -27,  -27,
+
       -27,  -27,  -27,  -27,  -27,  -27,  -27,  -27,  -27,  -27,
-      -27,  -27,  -27,  -27,  -27,  -27,  -27,  -27,  -27,  -27,
-      -27,  -27,  -27,  -27,  -27,  -27,  -27,  -27,  -27,  -27,
-
-      -27,  -27,  -27,  -27,  -27,  -27,  -27,  -27,  -27,  -27,
-      -27,  -27,  -27,  -27,  -27,  -27,  -27,  -27,  -27,  -27,
+      -27,   28,  -27,  -27,  -27,  -27,  -27,  -27,  -27,  -27,
       -27,  -27,  -27,  -27,  -27,  -27,  -27,  -27,  -27,  -27,
       -27,  -27,  -27,  -27,  -27,  -27,  -27,  -27
@@ -848 +838 @@
       -28,  -28,  -28,  -28,  -28,  -28,  -28,  -28,  -28,  -28,
       -28,  -28,  -28,  -28,  -28,  -28,  -28,  -28,  -28,  -28,
-      -28,  -28,  -28,  -28,  -28,  -28,  -28,  -28,  -28,  -28,
-      -28,  -28,  -28,  -28,  -28,  -28,  -28,  -28,  -28,  -28,
+      -28,  -28,  -28,   36,  -28,   36,  -28,  -28,   37,   37,
+       37,   37,   37,   37,   37,   37,   37,   37,  -28,  -28,
 
       -28,  -28,  -28,  -28,  -28,  -28,  -28,  -28,  -28,  -28,
@@ -866 +856 @@
 
       -29,  -29,  -29,  -29,  -29,  -29,  -29,  -29,  -29,  -29,
-      -29,  -29,  -29,  -29,  -29,  -29,  -29,  -29,   35,   35,
-       35,   35,   35,   35,   35,   35,   35,   35,  -29,  -29,
-      -29,  -29,  -29,  -29,  -29,   35,   35,   35,   35,   35,
-       35,   35,   35,   35,   35,   35,   35,   35,   35,   35,
-       35,   35,   35,   35,   35,   35,   35,   35,   35,   35,
-       35,  -29,  -29,  -29,  -29,   35,  -29,   35,   35,   35,
-       35,   35,   35,   35,   35,   35,   35,   35,   35,   35,
-       35,   35,   35,   35,   35,   35,   35,   35,   35,   35,
-       35,   35,   35,  -29,  -29,  -29,  -29,  -29
+      -29,  -29,  -29,  -29,  -29,  -29,  -29,  -29,  -29,  -29,
+      -29,  -29,  -29,  -29,  -29,  -29,  -29,  -29,  -29,  -29,
+      -29,  -29,  -29,  -29,  -29,  -29,  -29,  -29,  -29,  -29,
+      -29,  -29,  -29,  -29,  -29,  -29,  -29,  -29,  -29,  -29,
+      -29,  -29,  -29,  -29,  -29,  -29,  -29,  -29,  -29,  -29,
+      -29,  -29,  -29,  -29,  -29,  -29,  -29,  -29,  -29,  -29,
+      -29,  -29,  -29,  -29,  -29,  -29,  -29,  -29,  -29,  -29,
+      -29,  -29,  -29,  -29,  -29,  -29,  -29,  -29,  -29,  -29,
+      -29,  -29,  -29,  -29,  -29,  -29,  -29,  -29
 
     },
@@ -883 +873 @@
       -30,  -30,  -30,  -30,  -30,  -30,  -30,  -30,  -30,  -30,
       -30,  -30,  -30,  -30,  -30,  -30,  -30,  -30,  -30,  -30,
-      -30,  -30,  -30,  -30,  -30,  -30,  -30,  -30,   30,   30,
-       30,   30,   30,   30,   30,   30,   30,   30,  -30,  -30,
-      -30,  -30,  -30,  -30,  -30,   30,   30,   30,   30,   30,
-       30,   30,   30,   30,   30,   30,   30,   30,   30,   30,
-       30,   30,   30,   30,   30,   30,   30,   30,   30,   30,
-       30,  -30,  -30,  -30,  -30,   30,  -30,   30,   30,   30,
-
-       30,   30,   30,   30,   30,   30,   30,   30,   30,   30,
-       30,   30,   30,   30,   30,   30,   30,   30,   30,   30,
-       30,   30,   30,  -30,  -30,  -30,  -30,  -30
+      -30,  -30,  -30,  -30,  -30,  -30,  -30,  -30,  -30,  -30,
+      -30,  -30,  -30,  -30,  -30,  -30,  -30,  -30,  -30,  -30,
+      -30,  -30,  -30,  -30,  -30,  -30,  -30,  -30,  -30,  -30,
+      -30,  -30,  -30,  -30,  -30,  -30,  -30,  -30,  -30,  -30,
+      -30,  -30,  -30,  -30,  -30,  -30,  -30,  -30,  -30,  -30,
+      -30,  -30,  -30,  -30,  -30,  -30,  -30,  -30,  -30,  -30,
+
+      -30,  -30,  -30,  -30,  -30,  -30,  -30,  -30,  -30,  -30,
+      -30,  -30,  -30,  -30,  -30,  -30,  -30,  -30,  -30,  -30,
+      -30,  -30,  -30,  -30,  -30,  -30,  -30,  -30
     },
 
@@ -900 +890 @@
       -31,  -31,  -31,  -31,  -31,  -31,  -31,  -31,  -31,  -31,
       -31,  -31,  -31,  -31,  -31,  -31,  -31,  -31,  -31,  -31,
-      -31,  -31,  -31,  -31,  -31,  -31,  -31,  -31,   31,   31,
-       31,   31,   31,   31,   31,   31,   31,   31,  -31,  -31,
-      -31,  -31,  -31,  -31,  -31,   31,   31,   31,   31,   31,
-
-       31,   31,   31,   31,   31,   31,   31,   31,   31,   31,
-       31,   31,   31,   31,   31,   31,   31,   31,   31,   31,
-       31,  -31,  -31,  -31,  -31,   31,  -31,   31,   31,   31,
-       31,   31,   31,   31,   31,   31,   31,   31,   31,   31,
-       31,   31,   31,   31,   31,   31,   31,   31,   31,   31,
-       31,   31,   31,  -31,  -31,  -31,  -31,  -31
+      -31,  -31,  -31,  -31,  -31,  -31,  -31,  -31,  -31,  -31,
+      -31,  -31,  -31,  -31,  -31,  -31,  -31,  -31,  -31,  -31,
+      -31,  -31,  -31,  -31,  -31,  -31,  -31,  -31,  -31,  -31,
+
+      -31,  -31,  -31,  -31,  -31,  -31,  -31,  -31,  -31,  -31,
+      -31,  -31,  -31,  -31,  -31,  -31,  -31,  -31,  -31,  -31,
+      -31,  -31,  -31,  -31,  -31,  -31,  -31,  -31,  -31,  -31,
+      -31,  -31,  -31,  -31,  -31,  -31,  -31,  -31,  -31,  -31,
+      -31,  -31,  -31,  -31,  -31,  -31,  -31,  -31,  -31,  -31,
+      -31,  -31,  -31,  -31,  -31,  -31,  -31,  -31
     },
 
@@ -918 +908 @@
       -32,  -32,  -32,  -32,  -32,  -32,  -32,  -32,  -32,  -32,
 
-      -32,  -32,  -32,  -32,  -32,  -32,  -32,  -32,   32,   32,
-       32,   32,   32,   32,   32,   32,   32,   32,  -32,  -32,
-      -32,  -32,  -32,  -32,  -32,  -32,  -32,  -32,  -32,   25,
-      -32,  -32,  -32,  -32,  -32,  -32,  -32,  -32,  -32,  -32,
-      -32,  -32,  -32,  -32,  -32,  -32,  -32,  -32,  -32,  -32,
-      -32,  -32,  -32,  -32,  -32,  -32,  -32,  -32,  -32,  -32,
-      -32,   25,  -32,  -32,  -32,  -32,  -32,  -32,  -32,  -32,
-      -32,  -32,  -32,  -32,  -32,  -32,  -32,  -32,  -32,  -32,
-      -32,  -32,  -32,  -32,  -32,  -32,  -32,  -32
+      -32,  -32,  -32,  -32,  -32,  -32,  -32,  -32,   38,   38,
+       38,   38,   38,   38,   38,   38,   38,   38,  -32,  -32,
+      -32,  -32,  -32,  -32,  -32,   38,   38,   38,   38,   38,
+       38,   38,   38,   38,   38,   38,   38,   38,   38,   38,
+       38,   38,   38,   38,   38,   38,   38,   38,   38,   38,
+       38,  -32,  -32,  -32,  -32,   38,  -32,   38,   38,   38,
+       38,   38,   38,   38,   38,   38,   38,   38,   38,   38,
+       38,   38,   38,   38,   38,   38,   38,   38,   38,   38,
+       38,   38,   38,  -32,  -32,  -32,  -32,  -32
     },
 
@@ -935 +925 @@
       -33,  -33,  -33,  -33,  -33,  -33,  -33,  -33,  -33,  -33,
       -33,  -33,  -33,  -33,  -33,  -33,  -33,  -33,  -33,  -33,
-      -33,  -33,  -33,  -33,  -33,  -33,  -33,  -33,   34,   34,
-       34,   34,   34,   34,   34,   34,   34,   34,  -33,  -33,
-      -33,  -33,  -33,  -33,  -33,  -33,  -33,  -33,  -33,  -33,
-      -33,  -33,  -33,  -33,  -33,  -33,  -33,  -33,  -33,  -33,
-      -33,  -33,  -33,  -33,  -33,  -33,  -33,  -33,  -33,  -33,
-      -33,  -33,  -33,  -33,  -33,  -33,  -33,  -33,  -33,  -33,
-      -33,  -33,  -33,  -33,  -33,  -33,  -33,  -33,  -33,  -33,
-
-      -33,  -33,  -33,  -33,  -33,  -33,  -33,  -33,  -33,  -33,
-      -33,  -33,  -33,  -33,  -33,  -33,  -33,  -33
+      -33,  -33,  -33,  -33,  -33,  -33,  -33,  -33,   33,   33,
+       33,   33,   33,   33,   33,   33,   33,   33,  -33,  -33,
+      -33,  -33,  -33,  -33,  -33,   33,   33,   33,   33,   33,
+       33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
+       33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
+       33,  -33,  -33,  -33,  -33,   33,  -33,   33,   33,   33,
+       33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
+
+       33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
+       33,   33,   33,  -33,  -33,  -33,  -33,  -33
     },
 
@@ -954 +944 @@
       -34,  -34,  -34,  -34,  -34,  -34,  -34,  -34,   34,   34,
        34,   34,   34,   34,   34,   34,   34,   34,  -34,  -34,
-      -34,  -34,  -34,  -34,  -34,  -34,  -34,  -34,  -34,  -34,
-      -34,  -34,  -34,  -34,  -34,  -34,  -34,  -34,  -34,  -34,
-
-      -34,  -34,  -34,  -34,  -34,  -34,  -34,  -34,  -34,  -34,
-      -34,  -34,  -34,  -34,  -34,  -34,  -34,  -34,  -34,  -34,
-      -34,  -34,  -34,  -34,  -34,  -34,  -34,  -34,  -34,  -34,
-      -34,  -34,  -34,  -34,  -34,  -34,  -34,  -34,  -34,  -34,
-      -34,  -34,  -34,  -34,  -34,  -34,  -34,  -34
+      -34,  -34,  -34,  -34,  -34,   34,   34,   34,   34,   34,
+       34,   34,   34,   34,   34,   34,   34,   34,   34,   34,
+
+       34,   34,   34,   34,   34,   34,   34,   34,   34,   34,
+       34,  -34,  -34,  -34,  -34,   34,  -34,   34,   34,   34,
+       34,   34,   34,   34,   34,   34,   34,   34,   34,   34,
+       34,   34,   34,   34,   34,   34,   34,   34,   34,   34,
+       34,   34,   34,  -34,  -34,  -34,  -34,  -34
     },
 
@@ -972 +962 @@
 
        35,   35,   35,   35,   35,   35,   35,   35,  -35,  -35,
-      -35,  -35,  -35,  -35,  -35,   35,   35,   35,   35,   35,
-       35,   35,   35,   35,   35,   35,   35,   35,   35,   35,
-       35,   35,   35,   35,   35,   35,   35,   35,   35,   35,
-       35,  -35,  -35,  -35,  -35,   35,  -35,   35,   35,   35,
-       35,   35,   35,   35,   35,   35,   35,   35,   35,   35,
-       35,   35,   35,   35,   35,   35,   35,   35,   35,   35,
-       35,   35,   35,  -35,  -35,  -35,  -35,  -35
+      -35,  -35,  -35,  -35,  -35,  -35,  -35,  -35,  -35,   28,
+      -35,  -35,  -35,  -35,  -35,  -35,  -35,  -35,  -35,  -35,
+      -35,  -35,  -35,  -35,  -35,  -35,  -35,  -35,  -35,  -35,
+      -35,  -35,  -35,  -35,  -35,  -35,  -35,  -35,  -35,  -35,
+      -35,   28,  -35,  -35,  -35,  -35,  -35,  -35,  -35,  -35,
+      -35,  -35,  -35,  -35,  -35,  -35,  -35,  -35,  -35,  -35,
+      -35,  -35,  -35,  -35,  -35,  -35,  -35,  -35
+    },
+
+    {
+        3,  -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36,
+      -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36,
+
+      -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36,
+      -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36,
+      -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36,   37,   37,
+       37,   37,   37,   37,   37,   37,   37,   37,  -36,  -36,
+      -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36,
+      -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36,
+      -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36,
+      -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36,
+      -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36,
+      -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36,
+
+      -36,  -36,  -36,  -36,  -36,  -36,  -36,  -36
+    },
+
+    {
+        3,  -37,  -37,  -37,  -37,  -37,  -37,  -37,  -37,  -37,
+      -37,  -37,  -37,  -37,  -37,  -37,  -37,  -37,  -37,  -37,
+      -37,  -37,  -37,  -37,  -37,  -37,  -37,  -37,  -37,  -37,
+      -37,  -37,  -37,  -37,  -37,  -37,  -37,  -37,  -37,  -37,
+      -37,  -37,  -37,  -37,  -37,  -37,  -37,  -37,   37,   37,
+       37,   37,   37,   37,   37,   37,   37,   37,  -37,  -37,
+      -37,  -37,  -37,  -37,  -37,  -37,  -37,  -37,  -37,  -37,
+      -37,  -37,  -37,  -37,  -37,  -37,  -37,  -37,  -37,  -37,
+      -37,  -37,  -37,  -37,  -37,  -37,  -37,  -37,  -37,  -37,
+
+      -37,  -37,  -37,  -37,  -37,  -37,  -37,  -37,  -37,  -37,
+      -37,  -37,  -37,  -37,  -37,  -37,  -37,  -37,  -37,  -37,
+      -37,  -37,  -37,  -37,  -37,  -37,  -37,  -37,  -37,  -37,
+      -37,  -37,  -37,  -37,  -37,  -37,  -37,  -37
+    },
+
+    {
+        3,  -38,  -38,  -38,  -38,  -38,  -38,  -38,  -38,  -38,
+      -38,  -38,  -38,  -38,  -38,  -38,  -38,  -38,  -38,  -38,
+      -38,  -38,  -38,  -38,  -38,  -38,  -38,  -38,  -38,  -38,
+      -38,  -38,  -38,  -38,  -38,  -38,  -38,  -38,  -38,  -38,
+      -38,  -38,  -38,  -38,  -38,  -38,  -38,  -38,   38,   38,
+       38,   38,   38,   38,   38,   38,   38,   38,  -38,  -38,
+
+      -38,  -38,  -38,  -38,  -38,   38,   38,   38,   38,   38,
+       38,   38,   38,   38,   38,   38,   38,   38,   38,   38,
+       38,   38,   38,   38,   38,   38,   38,   38,   38,   38,
+       38,  -38,  -38,  -38,  -38,   38,  -38,   38,   38,   38,
+       38,   38,   38,   38,   38,   38,   38,   38,   38,   38,
+       38,   38,   38,   38,   38,   38,   38,   38,   38,   38,
+       38,   38,   38,  -38,  -38,  -38,  -38,  -38
     },
 
@@ -998 +1040 @@
         (yy_c_buf_p) = yy_cp;
 
-#define YY_NUM_RULES 19
-#define YY_END_OF_BUFFER 20
+#define YY_NUM_RULES 22
+#define YY_END_OF_BUFFER 23
 /* This struct is not used in this scanner,
    but its presence is necessary. */
@@ -1007 +1049 @@
         flex_int32_t yy_nxt;
         };
-static yyconst flex_int16_t yy_accept[36] =
+static yyconst flex_int16_t yy_accept[39] =
     {   0,
-        0,    0,   20,   19,    1,   19,   16,   17,    8,    6,
-        7,    9,    2,   12,   19,   13,   19,    5,   10,   18,
-        1,    4,    0,    2,    0,   14,   11,   15,    3,    5,
-        4,    2,    0,    2,    3
+        0,    0,   23,   22,    1,   22,   19,   20,    8,    6,
+        7,    9,    2,   18,   12,   22,   13,   17,   22,    5,
+       10,   21,    1,    4,   16,    0,    2,    0,   14,   11,
+       15,    3,    5,    4,    2,    0,    2,    3
     } ;
 
@@ -1018 +1060 @@
 static char *yy_last_accepting_cpos;
 
-static yyconst yy_state_type yy_NUL_trans[36] =
+static yyconst yy_state_type yy_NUL_trans[39] =
     {   0,
-       20,   20,    0,    0,    0,    0,    0,    0,    0,    0,
+       22,   22,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0
+        0,    0,    0,    0,    0,    0,    0,    0
     } ;
 
@@ -1053 +1095 @@
 #include "yacc_parser.hpp"
 
-#line 1056 "lex_parser.cpp"
+#line 1098 "lex_parser.cpp"
 
 #define INITIAL 0
@@ -1134 +1176 @@
 /* Amount of stuff to slurp up with each read. */
 #ifndef YY_READ_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k */
-#define YY_READ_BUF_SIZE 16384
-#else
 #define YY_READ_BUF_SIZE 8192
-#endif /* __ia64__ */
 #endif
 
@@ -1224 +1261 @@
         register int yy_act;
     
+#line 29 "lex_parser.lex"
+
+
+#line 1267 "lex_parser.cpp"
+
         if ( !(yy_init) )
                 {
@@ -1249 +1291 @@
                 yy_load_buffer_state( );
                 }
-
-        {
-#line 29 "lex_parser.lex"
-
-
-#line 1257 "lex_parser.cpp"
 
         while ( 1 )             /* loops until end-of-file is reached */
@@ -1388 +1424 @@
 case 16:
 YY_RULE_SETUP
-#line 68 "lex_parser.lex"
-return LEFT_PARENTHESIS;
+#line 67 "lex_parser.lex"
+return NE;
         YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 69 "lex_parser.lex"
-return RIGHT_PARENTHESIS;
+#line 68 "lex_parser.lex"
+return QUESTION_MARK;
         YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 71 "lex_parser.lex"
-return END;
+#line 69 "lex_parser.lex"
+return COLON;
         YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 72 "lex_parser.lex"
+#line 70 "lex_parser.lex"
+return LEFT_PARENTHESIS;
+        YY_BREAK
+case 20:
+YY_RULE_SETUP
+#line 71 "lex_parser.lex"
+return RIGHT_PARENTHESIS;
+        YY_BREAK
+case 21:
+YY_RULE_SETUP
+#line 73 "lex_parser.lex"
+return END;
+        YY_BREAK
+case 22:
+YY_RULE_SETUP
+#line 74 "lex_parser.lex"
 ECHO;
         YY_BREAK
-#line 1409 "lex_parser.cpp"
+#line 1460 "lex_parser.cpp"
 case YY_STATE_EOF(INITIAL):
         yyterminate();
@@ -1537 +1588 @@
         } /* end of action switch */
                 } /* end of scanning one token */
-        } /* end of user's declarations */
 } /* end of yylex */
 
@@ -2166 +2216 @@
         char *buf;
         yy_size_t n;
-        yy_size_t i;
+        int i;
     
         /* Get memory for full buffer, including space for trailing EOB's. */
@@ -2396 +2446 @@
 #define YYTABLES_NAME "yytables"
 
-#line 71 "lex_parser.lex"
+#line 74 "lex_parser.lex"

XIOS/dev/dev_olga/src/parse_expr/lex_parser.lex

@@ -65 +65 @@
 "<=" return LE;
 ">=" return GE;
-
+"/=" return NE;
+"?" return QUESTION_MARK;
+":" return COLON;
 "("  return LEFT_PARENTHESIS;
 ")"  return RIGHT_PARENTHESIS;

XIOS/dev/dev_olga/src/parse_expr/operator_expr.hpp

@@ -17 +17 @@
     typedef double (*functionScalar)(double);
     typedef double (*functionScalarScalar)(double, double);
+    typedef double (*functionScalarScalarScalar)(double, double,double);
     typedef CArray<double,1> (*functionField)(const CArray<double,1>&);
     typedef CArray<double,1> (*functionFieldField)(const CArray<double,1>&, const CArray<double,1>&);
     typedef CArray<double,1> (*functionFieldScalar)(const CArray<double,1>&, double);
     typedef CArray<double,1> (*functionScalarField)(double, const CArray<double,1>&);
-
+    typedef CArray<double,1> (*functionScalarScalarField)(double, double, const CArray<double,1>&);
+    typedef CArray<double,1> (*functionScalarFieldScalar)(double, const CArray<double,1>&, double);
+    typedef CArray<double,1> (*functionScalarFieldField)(double, const CArray<double,1>&, const CArray<double,1>&);
+    typedef CArray<double,1> (*functionFieldScalarScalar)(const CArray<double,1>&, double, double);
+    typedef CArray<double,1> (*functionFieldScalarField)(const CArray<double,1>&, double, const CArray<double,1>&);
+    typedef CArray<double,1> (*functionFieldFieldScalar)(const CArray<double,1>&,  const CArray<double,1>&, double);
+    typedef CArray<double,1> (*functionFieldFieldField)(const CArray<double,1>&,  const CArray<double,1>&, const CArray<double,1>&);
+    
     COperatorExpr(void)
     {
@@ -43 +51 @@
       opScalarScalar[string("le")] = le_ss;
       opScalarScalar[string("ge")] = ge_ss;
-
+      opScalarScalar[string("ne")] = ne_ss;
+      opScalarScalarScalar[string("cond")] = cond_sss;
+      
       opField[string("neg")] = neg_f;
       opField[string("cos")] = cos_f;
@@ -63 +73 @@
       opFieldField[string("le")] = le_ff;
       opFieldField[string("ge")] = ge_ff;
+      opFieldField[string("ne")] = ne_ff;
 
       opFieldScalar[string("add")] = add_fs;
@@ -74 +85 @@
       opFieldScalar[string("le")] = le_fs;
       opFieldScalar[string("ge")] = ge_fs;
+      opFieldScalar[string("ne")] = ne_fs;
 
       opScalarField[string("add")] = add_sf;
@@ -84 +96 @@
       opScalarField[string("le")] = le_sf;
       opScalarField[string("ge")] = ge_sf;
+      opScalarField[string("ne")] = ne_sf;
+
+      opScalarScalarField[string("cond")] = cond_ssf;
+      opScalarFieldScalar[string("cond")] = cond_sfs;
+      opScalarFieldField[string("cond")] = cond_sff;
+      opFieldScalarScalar[string("cond")] = cond_fss;
+      opFieldScalarField[string("cond")] = cond_fsf;
+      opFieldFieldScalar[string("cond")] = cond_ffs;
+      opFieldFieldField[string("cond")] = cond_fff;
+
+
     }
 
@@ -102 +125 @@
     }
 
+    functionScalarScalarScalar getOpScalarScalarScalar(const string& id)
+    {
+      map<string,double (*)(double,double,double)>::iterator it;
+      it = opScalarScalarScalar.find(id);
+      if (it == opScalarScalarScalar.end()) ERROR("functionScalarScalarScalar getOpScalarScalarScalar(const string& id)", << "unknown operator : " << id)
+      return it->second;
+    }
+
     functionField getOpField(const string& id)
     {
@@ -134 +165 @@
     }
 
+    functionScalarScalarField getOpScalarScalarField(const string& id)
+    {
+      map<string,functionScalarScalarField>::iterator it;
+      it = opScalarScalarField.find(id);
+      if (it == opScalarScalarField.end()) ERROR("functionScalarScalarField getOpScalarScalarField(const string& id)", << "unknown operator : " << id)
+      return it->second;
+    }
+
+    functionScalarFieldScalar getOpScalarFieldScalar(const string& id)
+    {
+      map<string,functionScalarFieldScalar>::iterator it;
+      it = opScalarFieldScalar.find(id);
+      if (it == opScalarFieldScalar.end()) ERROR("functionScalarFieldScalar getOpScalarScalarField(const string& id)", << "unknown operator : " << id)
+      return it->second;
+    }
+
+    functionScalarFieldField getOpScalarFieldField(const string& id)
+    {
+      map<string,functionScalarFieldField>::iterator it;
+      it = opScalarFieldField.find(id);
+      if (it == opScalarFieldField.end()) ERROR("functionScalarFieldField getOpScalarFieldField(const string& id)", << "unknown operator : " << id)
+      return it->second;
+    }
+
+    functionFieldScalarScalar getOpFieldScalarScalar(const string& id)
+    {
+      map<string,functionFieldScalarScalar>::iterator it;
+      it = opFieldScalarScalar.find(id);
+      if (it == opFieldScalarScalar.end()) ERROR("functionFieldScalarScalar getOpFieldScalarScalar(const string& id)", << "unknown operator : " << id)
+      return it->second;
+    }
+
+    functionFieldScalarField getOpFieldScalarField(const string& id)
+    {
+      map<string,functionFieldScalarField>::iterator it;
+      it = opFieldScalarField.find(id);
+      if (it == opFieldScalarField.end()) ERROR("functionFieldScalarField getOpFieldScalarField(const string& id)", << "unknown operator : " << id)
+      return it->second;
+    }
+
+    functionFieldFieldScalar getOpFieldFieldScalar(const string& id)
+    {
+      map<string,functionFieldFieldScalar>::iterator it;
+      it = opFieldFieldScalar.find(id);
+      if (it == opFieldFieldScalar.end()) ERROR("functionFieldFieldScalar getOpFieldFieldScalar(const string& id)", << "unknown operator : " << id)
+      return it->second;
+    }
+
+    functionFieldFieldField getOpFieldFieldField(const string& id)
+    {
+      map<string,functionFieldFieldField>::iterator it;
+      it = opFieldFieldField.find(id);
+      if (it == opFieldFieldField.end()) ERROR("functionFieldFieldField getOpFieldFieldField(const string& id)", << "unknown operator : " << id)
+      return it->second;
+    }
+    
+    
     map<string,functionScalar> opScalar;
     map<string,functionScalarScalar> opScalarScalar;
+    map<string,functionScalarScalarScalar> opScalarScalarScalar;
     map<string,functionField> opField;
     map<string,functionFieldField> opFieldField;
     map<string,functionFieldScalar> opFieldScalar;
     map<string,functionScalarField> opScalarField;
+    map<string,functionScalarScalarField> opScalarScalarField;
+    map<string,functionScalarFieldScalar> opScalarFieldScalar;
+    map<string,functionScalarFieldField> opScalarFieldField;
+    map<string,functionFieldScalarScalar> opFieldScalarScalar;
+    map<string,functionFieldScalarField> opFieldScalarField;
+    map<string,functionFieldFieldScalar> opFieldFieldScalar;
+    map<string,functionFieldFieldField> opFieldFieldField;
+
+
 
     static inline double neg_s(double x)   { return -x; }
@@ -160 +258 @@
     static inline double le_ss(double x, double y)    { return x <= y; }
     static inline double ge_ss(double x, double y)    { return x >= y; }
+    static inline double ne_ss(double x, double y)    { return x != y; }
 
     static inline CArray<double,1> neg_f(const CArray<double,1>& x)   { return Array<double,1>(-x); }
@@ -180 +279 @@
     static inline CArray<double,1> le_ff(const CArray<double,1>& x, const CArray<double,1>& y)    { return Array<double,1>(x <= y); }
     static inline CArray<double,1> ge_ff(const CArray<double,1>& x, const CArray<double,1>& y)    { return Array<double,1>(x >= y); }
+    static inline CArray<double,1> ne_ff(const CArray<double,1>& x, const CArray<double,1>& y)    { return Array<double,1>(x != y); }
 
     static inline CArray<double,1> add_fs(const CArray<double,1>& x, double y)   { return Array<double,1>(x + y); }
@@ -191 +291 @@
     static inline CArray<double,1> le_fs(const CArray<double,1>& x, double y)    { return Array<double,1>(x <= y); }
     static inline CArray<double,1> ge_fs(const CArray<double,1>& x, double y)    { return Array<double,1>(x >= y); }
+    static inline CArray<double,1> ne_fs(const CArray<double,1>& x, double y)    { return Array<double,1>(x != y); }
 
     static inline CArray<double,1> add_sf(double x, const CArray<double,1>& y)   { return Array<double,1>(x + y); }
@@ -201 +302 @@
     static inline CArray<double,1> le_sf(double x, const CArray<double,1>& y)    { return Array<double,1>(x <= y); }
     static inline CArray<double,1> ge_sf(double x, const CArray<double,1>& y)    { return Array<double,1>(x >= y); }
+    static inline CArray<double,1> ne_sf(double x, const CArray<double,1>& y)    { return Array<double,1>(x != y); }
+
+
+    static inline double cond_sss(double x, double y, double z)   { return (x==0) ? z : y ; }
+
+    static inline CArray<double,1> cond_ssf(double x, double y, const CArray<double,1>& z)
+    {
+      CArray<double,1> ret(z.numElements()) ;
+      if (x==0) ret=z ;
+      else ret=y ;
+      return ret ;
+    }
+
+    static inline CArray<double,1> cond_sfs(double x, const CArray<double,1>& y, double z)
+    {
+      CArray<double,1> ret(y.numElements()) ;
+     if (x==0) ret=z ;
+      else ret=y ;
+      return ret ;
+    }
+
+    static inline CArray<double,1> cond_sff(double x, const CArray<double,1>& y, const CArray<double,1>& z)
+    {
+      CArray<double,1> ret(y.numElements()) ;
+      if (x==0) ret=z ;
+      else ret=y ;
+      return ret ;
+    }
+    
+    static inline CArray<double,1> cond_fss(const CArray<double,1>& x, double y, double z)
+    {
+      CArray<double,1> ret(x.numElements()) ;
+      Array<double,1>::const_iterator itx=x.begin(),itxe=x.end();
+      Array<double,1>::iterator itret=ret.begin() ;
+      
+      for(;itx!=itxe;++itx,++itret) *itret=( (*itx==0)?z:y) ;
+      return ret ;
+    }
+
+    static inline CArray<double,1> cond_fsf(const CArray<double,1>& x, double y, const CArray<double,1>& z)
+    {
+      CArray<double,1> ret(x.numElements()) ;
+      Array<double,1>::const_iterator itx=x.begin(), itxe=x.end(), itz=z.begin();
+      Array<double,1>::iterator itret=ret.begin() ;
+      for(;itx!=itxe;++itx,++itz,++itret) *itret=( (*itx==0)?*itz:y) ;
+      return ret ;
+    }
+
+    static inline CArray<double,1> cond_ffs(const CArray<double,1>& x, const CArray<double,1>& y, double z)
+    {
+      CArray<double,1> ret(x.numElements()) ;
+      Array<double,1>::const_iterator itx=x.begin(), itxe=x.end(), ity=y.begin() ;
+      Array<double,1>::iterator itret=ret.begin() ;
+      for(;itx!=itxe;++itx,++ity,++itret) *itret=( (*itx==0)?z:*ity) ;
+      return ret ;
+    }
+
+    static inline CArray<double,1> cond_fff(const CArray<double,1>& x, const CArray<double,1>& y, const CArray<double,1>&  z)
+    {
+      CArray<double,1> ret(x.numElements()) ;
+      Array<double,1>::const_iterator itx=x.begin(), itxe=x.end(), ity=y.begin(), itz=z.begin() ;
+      Array<double,1>::iterator itret=ret.begin() ;
+      for(;itx!=itxe;++itx,++ity,++itz,++itret) *itret=( (*itx==0)?*itz:*ity) ;
+      return ret ;
+    }
+
   };
 

XIOS/dev/dev_olga/src/parse_expr/scalar_expr_node.cpp

@@ -23 +23 @@
   double CScalarVarExprNode::reduce() const
   {
-    if (!CVariable::has(varId)) 
-      ERROR("double CScalarVarExprNode::reduce() const", << "The variable " << varId << " does not exist.");
+    // $missing_value will be replaced with NaN
+    if (varId == "missing_value")
+    {
+      return std::numeric_limits<double>::quiet_NaN();
+    }
+    else
+    {
+      if (!CVariable::has(varId)) 
+        ERROR("double CScalarVarExprNode::reduce() const", << "The variable " << varId << " does not exist.");
 
-    return CVariable::get(varId)->getData<double>();
+      return CVariable::get(varId)->getData<double>();
+    }
   }
 
@@ -59 +67 @@
     return op(child1->reduce(), child2->reduce());
   }
+
+
+  CScalarTernaryOpExprNode::CScalarTernaryOpExprNode(IScalarExprNode* child1, const std::string& opId, IScalarExprNode* child2, IScalarExprNode* child3)
+    : child1(child1)
+    , opId(opId)
+    , child2(child2)
+    , child3(child3)
+  {
+    if (!child1 || !child2 || !child3)
+      ERROR("CScalarTernaryOpExprNode::CScalarTernaryOpExprNode(IScalarExprNode* child1, const std::string& opId, IScalarExprNode* child2, IScalarExprNode* child3)",
+            "Impossible to create the new expression node, an invalid child node was provided.");
+  }
+
+  double CScalarTernaryOpExprNode::reduce() const
+  {
+    COperatorExpr::functionScalarScalarScalar op = operatorExpr.getOpScalarScalarScalar(opId);
+    return op(child1->reduce(), child2->reduce(), child3->reduce());
+  }
 }

XIOS/dev/dev_olga/src/parse_expr/scalar_expr_node.hpp

@@ -107 +107 @@
       boost::scoped_ptr<IScalarExprNode> child1, child2; //!< The scalar child nodes to which the operator is applied
   };
+
+    class CScalarTernaryOpExprNode : public IScalarExprNode
+  {
+    public:
+      /*!
+       * Constructs an expression node corresponding to the specified ternary operation
+       * applied to the provided scalar child nodes.
+       * Note that the child nodes will be destroyed automatically when the parent node
+       * is destroyed.
+       *
+       * \param opId the identifier of the operator
+       * \param child1, child2 , child3 the scalar child nodes to which the operator is applied
+       */
+      CScalarTernaryOpExprNode(IScalarExprNode* child1, const std::string& opId, IScalarExprNode* child2, IScalarExprNode* child3);
+
+      double reduce() const;
+
+    private:
+      std::string opId; //!< The identifier of the field
+      boost::scoped_ptr<IScalarExprNode> child1, child2, child3; //!< The scalar child nodes to which the operator is applied
+  };
 }
 

XIOS/dev/dev_olga/src/parse_expr/yacc_parser.cpp

@@ -145 +145 @@
     LE = 270,
     GE = 271,
-    LEFT_PARENTHESIS = 272,
-    RIGHT_PARENTHESIS = 273,
-    END = 274,
-    NEG = 275
+    NE = 272,
+    LEFT_PARENTHESIS = 273,
+    RIGHT_PARENTHESIS = 274,
+    QUESTION_MARK = 275,
+    COLON = 276,
+    END = 277,
+    NEG = 278
   };
 #endif
@@ -163 +166 @@
   xios::IFilterExprNode* filterNode;
 
-#line 166 "yacc_parser.cpp" /* yacc.c:355  */
+#line 169 "yacc_parser.cpp" /* yacc.c:355  */
 };
 # define YYSTYPE_IS_TRIVIAL 1
@@ -178 +181 @@
 /* Copy the second part of user declarations.  */
 
-#line 181 "yacc_parser.cpp" /* yacc.c:358  */
+#line 184 "yacc_parser.cpp" /* yacc.c:358  */
 
 #ifdef short
@@ -420 +423 @@
 #define YYFINAL  16
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   204
+#define YYLAST   371
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  21
+#define YYNTOKENS  24
 /* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  4
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  52
+#define YYNRULES  64
 /* YYNSTATES -- Number of states.  */
-#define YYNSTATES  108
+#define YYNSTATES  138
 
 /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
    by yylex, with out-of-bounds checking.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   275
+#define YYMAXUTOK   278
 
 #define YYTRANSLATE(YYX)                                                \
@@ -470 +473 @@
        2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
        5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
-      15,    16,    17,    18,    19,    20
+      15,    16,    17,    18,    19,    20,    21,    22,    23
 };
 
@@ -477 +480 @@
 static const yytype_uint8 yyrline[] =
 {
-       0,    61,    61,    62,    66,    67,    68,    69,    70,    71,
-      72,    73,    74,    75,    76,    77,    78,    79,    80,    84,
-      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
-      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
-     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
-     115,   116,   117
+       0,    63,    63,    64,    68,    69,    70,    71,    72,    73,
+      74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
+      84,    88,    89,    90,    91,    92,    93,    94,    95,    96,
+      97,    98,    99,   100,   101,   102,   103,   104,   105,   106,
+     107,   108,   109,   110,   111,   112,   113,   114,   115,   116,
+     117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
+     127,   128,   129,   130,   131
 };
 #endif
@@ -492 +496 @@
 {
   "$end", "error", "$undefined", "NUMBER", "VAR", "ID", "AVERAGE", "PLUS",
-  "MINUS", "TIMES", "DIVIDE", "POWER", "EQ", "LT", "GT", "LE", "GE",
-  "LEFT_PARENTHESIS", "RIGHT_PARENTHESIS", "END", "NEG", "$accept", "Line",
-  "Expression", "Field_expr", YY_NULLPTR
+  "MINUS", "TIMES", "DIVIDE", "POWER", "EQ", "LT", "GT", "LE", "GE", "NE",
+  "LEFT_PARENTHESIS", "RIGHT_PARENTHESIS", "QUESTION_MARK", "COLON", "END",
+  "NEG", "$accept", "Line", "Expression", "Field_expr", YY_NULLPTR
 };
 #endif
@@ -505 +509 @@
        0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
      265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
-     275
+     275,   276,   277,   278
 };
 # endif
 
-#define YYPACT_NINF -13
+#define YYPACT_NINF -14
 
 #define yypact_value_is_default(Yystate) \
-  (!!((Yystate) == (-13)))
+  (!!((Yystate) == (-14)))
 
 #define YYTABLE_NINF -1
 
 #define yytable_value_is_error(Yytable_value) \
-  0
+  (!!((Yytable_value) == (-1)))
 
   /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
@@ -523 +527 @@
 static const yytype_int16 yypact[] =
 {
-      90,   -13,   -13,   -12,   -13,    35,    35,   -13,    44,   188,
-     103,    35,    24,    34,   116,   128,   -13,    35,    35,    35,
-      35,    65,    35,    35,    35,    35,    35,    35,    35,    35,
-      35,    35,    35,    35,    35,    35,    35,   -13,   140,   152,
-     -13,   -13,    -7,    23,    -7,    23,    24,    34,    24,    34,
-      54,    65,    65,    24,     0,    67,     0,    67,     0,    67,
-       0,    67,     0,    67,    -7,    23,    -7,    23,    24,    34,
-      24,    34,    24,    34,     0,    67,     0,    67,     0,    67,
-       0,    67,     0,    67,   -13,   -13,    65,    24,   164,    65,
-      65,    65,    65,    65,    65,    65,    65,    65,   176,    95,
-      95,    24,    24,    92,    92,    92,    92,    92
+      73,   -14,   -14,   -13,   -14,   124,   124,   -14,    39,   304,
+     104,   124,    34,    36,   220,   234,   -14,   124,   124,   124,
+     124,   133,   124,   124,   124,   124,   124,   124,   124,   124,
+     124,   124,   124,   124,   124,   124,   124,   124,   124,   124,
+     124,   -14,   248,   262,   -14,   -14,    -7,    27,    -7,    27,
+      34,    36,    34,    36,    30,   133,   133,    34,     0,    75,
+       0,    75,     0,    75,     0,    75,     0,    75,     0,    75,
+     145,   160,    -7,    27,    -7,    27,    34,    36,    34,    36,
+      34,    36,     0,    75,     0,    75,     0,    75,     0,    75,
+       0,    75,     0,    75,   175,   190,   -14,   -14,   133,    34,
+     276,   133,   133,   133,   133,   133,   133,   133,   133,   133,
+     133,   133,   124,   124,   124,   124,   290,    33,    33,    34,
+      34,   360,   360,   360,   360,   360,   360,   205,   318,   332,
+     318,   332,   318,   332,   318,   332,   133,   346
 };
 
@@ -541 +548 @@
 static const yytype_uint8 yydefact[] =
 {
-       0,     4,     5,    19,    20,     0,     0,     2,     0,     0,
-       0,     0,    10,    25,     0,     0,     1,     0,     0,     0,
+       0,     4,     5,    21,    22,     0,     0,     2,     0,     0,
+       0,     0,    10,    27,     0,     0,     1,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     3,     0,     0,
-      17,    32,     6,    34,     7,    36,     8,    38,     9,    40,
-       0,     0,     0,    11,    12,    43,    13,    45,    14,    47,
-      15,    49,    16,    51,    33,    21,    35,    22,    37,    23,
-      39,    24,    41,    26,    42,    27,    44,    28,    46,    29,
-      48,    30,    50,    31,    18,    52,     0,    10,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     6,
-       7,     8,     9,    12,    13,    14,    15,    16
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     3,     0,     0,    19,    35,     6,    44,     7,    46,
+       8,    48,     9,    50,     0,     0,     0,    11,    12,    53,
+      13,    55,    14,    57,    15,    59,    16,    61,    17,    63,
+       0,     0,    43,    23,    45,    24,    47,    25,    49,    26,
+      51,    28,    52,    29,    54,    30,    56,    31,    58,    32,
+      60,    33,    62,    34,     0,     0,    20,    64,     0,    10,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     6,     7,     8,
+       9,    12,    13,    14,    15,    16,    17,     0,    18,    36,
+      37,    38,    39,    40,    41,    42,     0,    18
 };
 
@@ -557 +567 @@
 static const yytype_int8 yypgoto[] =
 {
-     -13,   -13,    -5,    31
+     -14,   -14,    -5,    35
 };
 
@@ -569 +579 @@
      positive, shift that token.  If negative, reduce the rule whose
      number is the opposite.  If YYTABLE_NINF, syntax error.  */
-static const yytype_uint8 yytable[] =
-{
-      12,    14,    19,    20,    21,    11,    38,    17,    18,    19,
-      20,    21,    42,    44,    46,    48,    53,    54,    56,    58,
-      60,    62,    64,    66,    68,    70,    72,    74,    76,    78,
-      80,    82,    29,    30,    31,    21,    13,    15,     1,     2,
-       3,     4,    39,     5,    16,    31,    87,    88,    43,    45,
-      47,    49,     6,    55,    57,    59,    61,    63,    65,    67,
-      69,    71,    73,    75,    77,    79,    81,    83,     1,     2,
-      50,    86,     0,    51,    27,    28,    29,    30,    31,     0,
-       0,    98,    52,     0,    99,   100,   101,   102,   103,   104,
-     105,   106,   107,     1,     2,     3,     4,     0,     5,    89,
-      90,    91,    92,    21,    91,    92,    21,     6,     0,     7,
-      27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
-       0,     0,    37,    17,    18,    19,    20,    21,    22,    23,
-      24,    25,    26,     0,    40,    27,    28,    29,    30,    31,
-      32,    33,    34,    35,    36,     0,    41,    17,    18,    19,
-      20,    21,    22,    23,    24,    25,    26,     0,    84,    27,
-      28,    29,    30,    31,    32,    33,    34,    35,    36,     0,
-      85,    89,    90,    91,    92,    21,    93,    94,    95,    96,
-      97,     0,    40,    89,    90,    91,    92,    21,    93,    94,
-      95,    96,    97,     0,    84,    17,    18,    19,    20,    21,
-      22,    23,    24,    25,    26
+static const yytype_int16 yytable[] =
+{
+      12,    14,    19,    20,    21,    11,    42,    17,    18,    19,
+      20,    21,    46,    48,    50,    52,    57,    58,    60,    62,
+      64,    66,    68,    70,    72,    74,    76,    78,    80,    82,
+      84,    86,    88,    90,    92,    94,    31,    32,    33,    16,
+      13,    15,   103,   104,    21,    21,    43,    33,    98,     0,
+      99,   100,    47,    49,    51,    53,     0,    59,    61,    63,
+      65,    67,    69,    71,    73,    75,    77,    79,    81,    83,
+      85,    87,    89,    91,    93,    95,     1,     2,     3,     4,
+       0,     5,    29,    30,    31,    32,    33,     0,     0,     0,
+       0,     6,     0,   116,     0,     7,   117,   118,   119,   120,
+     121,   122,   123,   124,   125,   126,   127,   128,   130,   132,
+     134,    29,    30,    31,    32,    33,    34,    35,    36,    37,
+      38,    39,     0,     0,    40,     0,    41,     1,     2,     3,
+       4,   137,     5,     0,     0,     0,     1,     2,    54,     0,
+       0,    55,     6,     0,     0,     0,     0,   129,   131,   133,
+     135,    56,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,     0,     0,    28,   112,    29,    30,    31,
+      32,    33,    34,    35,    36,    37,    38,    39,     0,     0,
+      40,   113,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,     0,     0,    28,   114,    29,    30,    31,
+      32,    33,    34,    35,    36,    37,    38,    39,     0,     0,
+      40,   115,   101,   102,   103,   104,    21,   105,   106,   107,
+     108,   109,   110,     0,     0,   111,   136,    17,    18,    19,
+      20,    21,    22,    23,    24,    25,    26,    27,     0,    44,
+      28,    29,    30,    31,    32,    33,    34,    35,    36,    37,
+      38,    39,     0,    45,    40,    17,    18,    19,    20,    21,
+      22,    23,    24,    25,    26,    27,     0,    96,    28,    29,
+      30,    31,    32,    33,    34,    35,    36,    37,    38,    39,
+       0,    97,    40,   101,   102,   103,   104,    21,   105,   106,
+     107,   108,   109,   110,     0,    44,   111,   101,   102,   103,
+     104,    21,   105,   106,   107,   108,   109,   110,     0,    96,
+     111,    17,    18,    19,    20,    21,    22,    23,    24,    25,
+      26,    27,     0,     0,    28,    17,    18,    19,    20,    21,
+      22,    23,    24,    25,    26,    27,     0,     0,    -1,    29,
+      30,    31,    32,    33,    34,    35,    36,    37,    38,    39,
+       0,     0,    -1,   101,   102,   103,   104,    21,   105,   106,
+     107,   108,   109,   110,     0,     0,    -1,   101,   102,   103,
+     104,    21
 };
 
-static const yytype_int8 yycheck[] =
-{
-       5,     6,     9,    10,    11,    17,    11,     7,     8,     9,
+static const yytype_int16 yycheck[] =
+{
+       5,     6,     9,    10,    11,    18,    11,     7,     8,     9,
       10,    11,    17,    18,    19,    20,    21,    22,    23,    24,
       25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
-      35,    36,     9,    10,    11,    11,     5,     6,     3,     4,
-       5,     6,    11,     8,     0,    11,    51,    52,    17,    18,
-      19,    20,    17,    22,    23,    24,    25,    26,    27,    28,
-      29,    30,    31,    32,    33,    34,    35,    36,     3,     4,
-       5,    17,    -1,     8,     7,     8,     9,    10,    11,    -1,
-      -1,    86,    17,    -1,    89,    90,    91,    92,    93,    94,
-      95,    96,    97,     3,     4,     5,     6,    -1,     8,     7,
-       8,     9,    10,    11,     9,    10,    11,    17,    -1,    19,
-       7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
-      -1,    -1,    19,     7,     8,     9,    10,    11,    12,    13,
-      14,    15,    16,    -1,    18,     7,     8,     9,    10,    11,
-      12,    13,    14,    15,    16,    -1,    18,     7,     8,     9,
-      10,    11,    12,    13,    14,    15,    16,    -1,    18,     7,
-       8,     9,    10,    11,    12,    13,    14,    15,    16,    -1,
-      18,     7,     8,     9,    10,    11,    12,    13,    14,    15,
-      16,    -1,    18,     7,     8,     9,    10,    11,    12,    13,
-      14,    15,    16,    -1,    18,     7,     8,     9,    10,    11,
-      12,    13,    14,    15,    16
+      35,    36,    37,    38,    39,    40,     9,    10,    11,     0,
+       5,     6,     9,    10,    11,    11,    11,    11,    18,    -1,
+      55,    56,    17,    18,    19,    20,    -1,    22,    23,    24,
+      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    40,     3,     4,     5,     6,
+      -1,     8,     7,     8,     9,    10,    11,    -1,    -1,    -1,
+      -1,    18,    -1,    98,    -1,    22,   101,   102,   103,   104,
+     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
+     115,     7,     8,     9,    10,    11,    12,    13,    14,    15,
+      16,    17,    -1,    -1,    20,    -1,    22,     3,     4,     5,
+       6,   136,     8,    -1,    -1,    -1,     3,     4,     5,    -1,
+      -1,     8,    18,    -1,    -1,    -1,    -1,   112,   113,   114,
+     115,    18,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    -1,    -1,    20,    21,     7,     8,     9,
+      10,    11,    12,    13,    14,    15,    16,    17,    -1,    -1,
+      20,    21,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    -1,    -1,    20,    21,     7,     8,     9,
+      10,    11,    12,    13,    14,    15,    16,    17,    -1,    -1,
+      20,    21,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    -1,    -1,    20,    21,     7,     8,     9,
+      10,    11,    12,    13,    14,    15,    16,    17,    -1,    19,
+      20,     7,     8,     9,    10,    11,    12,    13,    14,    15,
+      16,    17,    -1,    19,    20,     7,     8,     9,    10,    11,
+      12,    13,    14,    15,    16,    17,    -1,    19,    20,     7,
+       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
+      -1,    19,    20,     7,     8,     9,    10,    11,    12,    13,
+      14,    15,    16,    17,    -1,    19,    20,     7,     8,     9,
+      10,    11,    12,    13,    14,    15,    16,    17,    -1,    19,
+      20,     7,     8,     9,    10,    11,    12,    13,    14,    15,
+      16,    17,    -1,    -1,    20,     7,     8,     9,    10,    11,
+      12,    13,    14,    15,    16,    17,    -1,    -1,    20,     7,
+       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
+      -1,    -1,    20,     7,     8,     9,    10,    11,    12,    13,
+      14,    15,    16,    17,    -1,    -1,    20,     7,     8,     9,
+      10,    11
 };
 
@@ -623 +667 @@
 static const yytype_uint8 yystos[] =
 {
-       0,     3,     4,     5,     6,     8,    17,    19,    22,    23,
-      24,    17,    23,    24,    23,    24,     0,     7,     8,     9,
-      10,    11,    12,    13,    14,    15,    16,     7,     8,     9,
-      10,    11,    12,    13,    14,    15,    16,    19,    23,    24,
-      18,    18,    23,    24,    23,    24,    23,    24,    23,    24,
-       5,     8,    17,    23,    23,    24,    23,    24,    23,    24,
-      23,    24,    23,    24,    23,    24,    23,    24,    23,    24,
-      23,    24,    23,    24,    23,    24,    23,    24,    23,    24,
-      23,    24,    23,    24,    18,    18,    17,    23,    23,     7,
-       8,     9,    10,    12,    13,    14,    15,    16,    23,    23,
-      23,    23,    23,    23,    23,    23,    23,    23
+       0,     3,     4,     5,     6,     8,    18,    22,    25,    26,
+      27,    18,    26,    27,    26,    27,     0,     7,     8,     9,
+      10,    11,    12,    13,    14,    15,    16,    17,    20,     7,
+       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
+      20,    22,    26,    27,    19,    19,    26,    27,    26,    27,
+      26,    27,    26,    27,     5,     8,    18,    26,    26,    27,
+      26,    27,    26,    27,    26,    27,    26,    27,    26,    27,
+      26,    27,    26,    27,    26,    27,    26,    27,    26,    27,
+      26,    27,    26,    27,    26,    27,    26,    27,    26,    27,
+      26,    27,    26,    27,    26,    27,    19,    19,    18,    26,
+      26,     7,     8,     9,    10,    12,    13,    14,    15,    16,
+      17,    20,    21,    21,    21,    21,    26,    26,    26,    26,
+      26,    26,    26,    26,    26,    26,    26,    26,    26,    27,
+      26,    27,    26,    27,    26,    27,    21,    26
 };
 
@@ -639 +686 @@
 static const yytype_uint8 yyr1[] =
 {
-       0,    21,    22,    22,    23,    23,    23,    23,    23,    23,
-      23,    23,    23,    23,    23,    23,    23,    23,    23,    24,
-      24,    24,    24,    24,    24,    24,    24,    24,    24,    24,
-      24,    24,    24,    24,    24,    24,    24,    24,    24,    24,
-      24,    24,    24,    24,    24,    24,    24,    24,    24,    24,
-      24,    24,    24
+       0,    24,    25,    25,    26,    26,    26,    26,    26,    26,
+      26,    26,    26,    26,    26,    26,    26,    26,    26,    26,
+      26,    27,    27,    27,    27,    27,    27,    27,    27,    27,
+      27,    27,    27,    27,    27,    27,    27,    27,    27,    27,
+      27,    27,    27,    27,    27,    27,    27,    27,    27,    27,
+      27,    27,    27,    27,    27,    27,    27,    27,    27,    27,
+      27,    27,    27,    27,    27
 };
 
@@ -651 +699 @@
 {
        0,     2,     1,     2,     1,     1,     3,     3,     3,     3,
-       2,     3,     3,     3,     3,     3,     3,     3,     4,     1,
-       1,     3,     3,     3,     3,     2,     3,     3,     3,     3,
+       2,     3,     3,     3,     3,     3,     3,     3,     5,     3,
+       4,     1,     1,     3,     3,     3,     3,     2,     3,     3,
+       3,     3,     3,     3,     3,     3,     5,     5,     5,     5,
+       5,     5,     5,     3,     3,     3,     3,     3,     3,     3,
        3,     3,     3,     3,     3,     3,     3,     3,     3,     3,
-       3,     3,     3,     3,     3,     3,     3,     3,     3,     3,
-       3,     3,     4
+       3,     3,     3,     3,     4
 };
 
@@ -1332 +1381 @@
     {
         case 2:
-#line 61 "yacc_parser.yacc" /* yacc.c:1646  */
+#line 63 "yacc_parser.yacc" /* yacc.c:1646  */
     { /* Nothing to do */ }
-#line 1337 "yacc_parser.cpp" /* yacc.c:1646  */
+#line 1386 "yacc_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 3:
-#line 62 "yacc_parser.yacc" /* yacc.c:1646  */
+#line 64 "yacc_parser.yacc" /* yacc.c:1646  */
     { parsed = (yyvsp[-1].filterNode); }
-#line 1343 "yacc_parser.cpp" /* yacc.c:1646  */
+#line 1392 "yacc_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 4:
-#line 66 "yacc_parser.yacc" /* yacc.c:1646  */
+#line 68 "yacc_parser.yacc" /* yacc.c:1646  */
     { (yyval.scalarNode) = new CScalarValExprNode(*(yyvsp[0].str)); delete (yyvsp[0].str); }
-#line 1349 "yacc_parser.cpp" /* yacc.c:1646  */
+#line 1398 "yacc_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 5:
-#line 67 "yacc_parser.yacc" /* yacc.c:1646  */
+#line 69 "yacc_parser.yacc" /* yacc.c:1646  */
     { (yyval.scalarNode) = new CScalarVarExprNode(*(yyvsp[0].str)); delete (yyvsp[0].str); }
-#line 1355 "yacc_parser.cpp" /* yacc.c:1646  */
+#line 1404 "yacc_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 6:
-#line 68 "yacc_parser.yacc" /* yacc.c:1646  */
+#line 70 "yacc_parser.yacc" /* yacc.c:1646  */
     { (yyval.scalarNode) = new CScalarBinaryOpExprNode((yyvsp[-2].scalarNode), "add", (yyvsp[0].scalarNode)); }
-#line 1361 "yacc_parser.cpp" /* yacc.c:1646  */
+#line 1410 "yacc_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 7:
-#line 69 "yacc_parser.yacc" /* yacc.c:1646  */
+#line 71 "yacc_parser.yacc" /* yacc.c:1646  */
     { (yyval.scalarNode) = new CScalarBinaryOpExprNode((yyvsp[-2].scalarNode), "minus", (yyvsp[0].scalarNode)); }
-#line 1367 "yacc_parser.cpp" /* yacc.c:1646  */
+#line 1416 "yacc_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 8:
-#line 70 "yacc_parser.yacc" /* yacc.c:1646  */
+#line 72 "yacc_parser.yacc" /* yacc.c:1646  */
     { (yyval.scalarNode) = new CScalarBinaryOpExprNode((yyvsp[-2].scalarNode), "mult", (yyvsp[0].scalarNode)); }
-#line 1373 "yacc_parser.cpp" /* yacc.c:1646  */
+#line 1422 "yacc_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 9:
-#line 71 "yacc_parser.yacc" /* yacc.c:1646  */
+#line 73 "yacc_parser.yacc" /* yacc.c:1646  */
     { (yyval.scalarNode) = new CScalarBinaryOpExprNode((yyvsp[-2].scalarNode), "div", (yyvsp[0].scalarNode)); }
-#line 1379 "yacc_parser.cpp" /* yacc.c:1646  */
+#line 1428 "yacc_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 10:
-#line 72 "yacc_parser.yacc" /* yacc.c:1646  */
+#line 74 "yacc_parser.yacc" /* yacc.c:1646  */
     { (yyval.scalarNode) = new CScalarUnaryOpExprNode("neg", (yyvsp[0].scalarNode)); }
-#line 1385 "yacc_parser.cpp" /* yacc.c:1646  */
+#line 1434 "yacc_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 11:
-#line 73 "yacc_parser.yacc" /* yacc.c:1646  */
+#line 75 "yacc_parser.yacc" /* yacc.c:1646  */
     { (yyval.scalarNode) = new CScalarBinaryOpExprNode((yyvsp[-2].scalarNode), "pow", (yyvsp[0].scalarNode)); }
-#line 1391 "yacc_parser.cpp" /* yacc.c:1646  */
+#line 1440 "yacc_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 12:
-#line 74 "yacc_parser.yacc" /* yacc.c:1646  */
+#line 76 "yacc_parser.yacc" /* yacc.c:1646  */
     { (yyval.scalarNode) = new CScalarBinaryOpExprNode((yyvsp[-2].scalarNode), "eq", (yyvsp[0].scalarNode)); }
-#line 1397 "yacc_parser.cpp" /* yacc.c:1646  */
+#line 1446 "yacc_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 13:
-#line 75 "yacc_parser.yacc" /* yacc.c:1646  */
+#line 77 "yacc_parser.yacc" /* yacc.c:1646  */
     { (yyval.scalarNode) = new CScalarBinaryOpExprNode((yyvsp[-2].scalarNode), "lt", (yyvsp[0].scalarNode)); }
-#line 1403 "yacc_parser.cpp" /* yacc.c:1646  */
+#line 1452 "yacc_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 14:
-#line 76 "yacc_parser.yacc" /* yacc.c:1646  */
+#line 78 "yacc_parser.yacc" /* yacc.c:1646  */
     { (yyval.scalarNode) = new CScalarBinaryOpExprNode((yyvsp[-2].scalarNode), "gt", (yyvsp[0].scalarNode)); }
-#line 1409 "yacc_parser.cpp" /* yacc.c:1646  */
+#line 1458 "yacc_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 15:
-#line 77 "yacc_parser.yacc" /* yacc.c:1646  */
+#line 79 "yacc_parser.yacc" /* yacc.c:1646  */
     { (yyval.scalarNode) = new CScalarBinaryOpExprNode((yyvsp[-2].scalarNode), "le", (yyvsp[0].scalarNode)); }
-#line 1415 "yacc_parser.cpp" /* yacc.c:1646  */
+#line 1464 "yacc_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 16:
-#line 78 "yacc_parser.yacc" /* yacc.c:1646  */
+#line 80 "yacc_parser.yacc" /* yacc.c:1646  */
     { (yyval.scalarNode) = new CScalarBinaryOpExprNode((yyvsp[-2].scalarNode), "ge", (yyvsp[0].scalarNode)); }
-#line 1421 "yacc_parser.cpp" /* yacc.c:1646  */
+#line 1470 "yacc_parser.cpp" /* yacc.c:1646  */
     break;
 
   case 17:
-#line 79 "yacc_parser.yacc" /* yacc.c:1646  */
+#line 81 "yacc_parser.yacc" /* yacc.c:1646  */
+    { (yyval.scalarNode) = new CScalarBinaryOpExprNode((yyvsp[-2].scalarNode), "ne", (yyvsp[0].scalarNode)); }
+#line 1476 "yacc_parser.cpp" /* yacc.c:1646  */
+    break;
+
+  case 18:
+#line 82 "yacc_parser.yacc" /* yacc.c:1646  */
+    {(yyval.scalarNode) = new CScalarTernaryOpExprNode((yyvsp[-4].scalarNode), "cond", (yyvsp[-2].scalarNode), (yyvsp[0].scalarNode));}
+#line 1482 "yacc_parser.cpp" /* yacc.c:1646  */
+    break;
+
+  case 19:
+#line 83 "yacc_parser.yacc" /* yacc.c:1646  */
     { (yyval.scalarNode) = (yyvsp[-1].scalarNode); }
-#line 1427 "yacc_parser.cpp" /* yacc.c:1646  */
-    break;
-
-  case 18:
-#line 80 "yacc_parser.yacc" /* yacc.c:1646  */
+#line 1488 "yacc_parser.cpp" /* yacc.c:1646  */
+    break;
+
+  case 20:
+#line 84 "yacc_parser.yacc" /* yacc.c:1646  */
     { (yyval.scalarNode) = new CScalarUnaryOpExprNode(*(yyvsp[-3].str), (yyvsp[-1].scalarNode)); delete (yyvsp[-3].str); }
-#line 1433 "yacc_parser.cpp" /* yacc.c:1646  */
-    break;
-
-  case 19:
-#line 84 "yacc_parser.yacc" /* yacc.c:1646  */
+#line 1494 "yacc_parser.cpp" /* yacc.c:1646  */
+    break;
+
+  case 21:
+#line 88 "yacc_parser.yacc" /* yacc.c:1646  */
     { (yyval.filterNode) = new CFilterFieldExprNode(*(yyvsp[0].str)); delete (yyvsp[0].str); }
-#line 1439 "yacc_parser.cpp" /* yacc.c:1646  */
-    break;
-
-  case 20:
-#line 85 "yacc_parser.yacc" /* yacc.c:1646  */
+#line 1500 "yacc_parser.cpp" /* yacc.c:1646  */
+    break;
+
+  case 22:
+#line 89 "yacc_parser.yacc" /* yacc.c:1646  */
     { (yyval.filterNode) = new CFilterTemporalFieldExprNode(*(yyvsp[0].str)); delete (yyvsp[0].str); }
-#line 1445 "yacc_parser.cpp" /* yacc.c:1646  */
-    break;
-
-  case 21:
-#line 86 "yacc_parser.yacc" /* yacc.c:1646  */
+#line 1506 "yacc_parser.cpp" /* yacc.c:1646  */
+    break;
+
+  case 23:
+#line 90 "yacc_parser.yacc" /* yacc.c:1646  */
     { (yyval.filterNode) = new CFilterFieldFieldOpExprNode((yyvsp[-2].filterNode), "add", (yyvsp[0].filterNode)); }
-#line 1451 "yacc_parser.cpp" /* yacc.c:1646  */
-    break;
-
-  case 22:
-#line 87 "yacc_parser.yacc" /* yacc.c:1646  */
+#line 1512 "yacc_parser.cpp" /* yacc.c:1646  */
+    break;
+
+  case 24:
+#line 91 "yacc_parser.yacc" /* yacc.c:1646  */
     { (yyval.filterNode) = new CFilterFieldFieldOpExprNode((yyvsp[-2].filterNode), "minus", (yyvsp[0].filterNode)); }
-#line 1457 "yacc_parser.cpp" /* yacc.c:1646  */
-    break;
-
-  case 23:
-#line 88 "yacc_parser.yacc" /* yacc.c:1646  */
+#line 1518 "yacc_parser.cpp" /* yacc.c:1646  */
+    break;
+
+  case 25:
+#line 92 "yacc_parser.yacc" /* yacc.c:1646  */
     { (yyval.filterNode) = new CFilterFieldFieldOpExprNode((yyvsp[-2].filterNode), "mult", (yyvsp[0].filterNode)); }
-#line 1463 "yacc_parser.cpp" /* yacc.c:1646  */
-    break;
-
-  case 24:
-#line 89 "yacc_parser.yacc" /* yacc.c:1646  */
+#line 1524 "yacc_parser.cpp" /* yacc.c:1646  */
+    break;
+
+  case 26:
+#line 93 "yacc_parser.yacc" /* yacc.c:1646  */
     { (yyval.filterNode) = new CFilterFieldFieldOpExprNode((yyvsp[-2].filterNode), "div", (yyvsp[0].filterNode)); }
-#line 1469 "yacc_parser.cpp" /* yacc.c:1646  */
-    break;
-
-  case 25:
-#line 90 "yacc_parser.yacc" /* yacc.c:1646  */
+#line 1530 "yacc_parser.cpp" /* yacc.c:1646  */
+    break;
+
+  case 27:
+#line 94 "yacc_parser.yacc" /* yacc.c:1646  */
     { (yyval.filterNode) = new CFilterUnaryOpExprNode("neg", (yyvsp[0].filterNode)); }
-#line 1475 "yacc_parser.cpp" /* yacc.c:1646  */
-    break;
-
-  case 26:
-#line 91 "yacc_parser.yacc" /* yacc.c:1646  */
+#line 1536 "yacc_parser.cpp" /* yacc.c:1646  */
+    break;
+
+  case 28:
+#line 95 "yacc_parser.yacc" /* yacc.c:1646  */
     { (yyval.filterNode) = new CFilterFieldFieldOpExprNode((yyvsp[-2].filterNode), "pow", (yyvsp[0].filterNode)); }
-#line 1481 "yacc_parser.cpp" /* yacc.c:1646  */
-    break;
-
-  case 27:
-#line 92 "yacc_parser.yacc" /* yacc.c:1646  */
+#line 1542 "yacc_parser.cpp" /* yacc.c:1646  */
+    break;
+
+  case 29:
+#line 96 "yacc_parser.yacc" /* yacc.c:1646  */
     { (yyval.filterNode) = new CFilterFieldFieldOpExprNode((yyvsp[-2].filterNode), "eq", (yyvsp[0].filterNode)); }
-#line 1487 "yacc_parser.cpp" /* yacc.c:1646  */
-    break;
-
-  case 28:
-#line 93 "yacc_parser.yacc" /* yacc.c:1646  */
+#line 1548 "yacc_parser.cpp" /* yacc.c:1646  */
+    break;
+
+  case 30:
+#line 97 "yacc_parser.yacc" /* yacc.c:1646  */
     { (yyval.filterNode) = new CFilterFieldFieldOpExprNode((yyvsp[-2].filterNode), "lt", (yyvsp[0].filterNode)); }
-#line 1493 "yacc_parser.cpp" /* yacc.c:1646  */
-    break;
-
-  case 29:
-#line 94 "yacc_parser.yacc" /* yacc.c:1646  */
+#line 1554 "yacc_parser.cpp" /* yacc.c:1646  */
+    break;
+
+  case 31:
+#line 98 "yacc_parser.yacc" /* yacc.c:1646  */
     { (yyval.filterNode) = new CFilterFieldFieldOpExprNode((yyvsp[-2].filterNode), "gt", (yyvsp[0].filterNode)); }
-#line 1499 "yacc_parser.cpp" /* yacc.c:1646  */
-    break;
-
-  case 30:
-#line 95 "yacc_parser.yacc" /* yacc.c:1646  */
+#line 1560 "yacc_parser.cpp" /* yacc.c:1646  */
+    break;
+
+  case 32:
+#line 99 "yacc_parser.yacc" /* yacc.c:1646  */
     { (yyval.filterNode) = new CFilterFieldFieldOpExprNode((yyvsp[-2].filterNode), "le", (yyvsp[0].filterNode)); }
-#line 1505 "yacc_parser.cpp" /* yacc.c:1646  */
-    break;
-
-  case 31:
-#line 96 "yacc_parser.yacc" /* yacc.c:1646  */
+#line 1566 "yacc_parser.cpp" /* yacc.c:1646  */
+    break;
+
+  case 33:
+#line 100 "yacc_parser.yacc" /* yacc.c:1646  */
     { (yyval.filterNode) = new CFilterFieldFieldOpExprNode((yyvsp[-2].filterNode), "ge", (yyvsp[0].filterNode)); }
-#line 1511 "yacc_parser.cpp" /* yacc.c:1646  */
-    break;
-
-  case 32:
-#line 97 "yacc_parser.yacc" /* yacc.c:1646  */
+#line 1572 "yacc_parser.cpp" /* yacc.c:1646  */
+    break;
+
+  case 34:
+#line 101 "yacc_parser.yacc" /* yacc.c:1646  */
+    { (yyval.filterNode) = new CFilterFieldFieldOpExprNode((yyvsp[-2].filterNode), "ne", (yyvsp[0].filterNode)); }
+#line 1578 "yacc_parser.cpp" /* yacc.c:1646  */
+    break;
+
+  case 35:
+#line 102 "yacc_parser.yacc" /* yacc.c:1646  */
     { (yyval.filterNode) = (yyvsp[-1].filterNode); }
-#line 1517 "yacc_parser.cpp" /* yacc.c:1646  */
-    break;
-
-  case 33:
-#line 98 "yacc_parser.yacc" /* yacc.c:1646  */
+#line 1584 "yacc_parser.cpp" /* yacc.c:1646  */
+    break;
+
+  case 36:
+#line 103 "yacc_parser.yacc" /* yacc.c:1646  */
+    {(yyval.filterNode) = new CFilterScalarScalarFieldOpExprNode((yyvsp[-4].scalarNode), "cond",(yyvsp[-2].scalarNode), (yyvsp[0].filterNode));}
+#line 1590 "yacc_parser.cpp" /* yacc.c:1646  */
+    break;
+
+  case 37:
+#line 104 "yacc_parser.yacc" /* yacc.c:1646  */
+    {(yyval.filterNode) = new CFilterScalarFieldScalarOpExprNode((yyvsp[-4].scalarNode), "cond",(yyvsp[-2].filterNode), (yyvsp[0].scalarNode));}
+#line 1596 "yacc_parser.cpp" /* yacc.c:1646  */
+    break;
+
+  case 38:
+#line 105 "yacc_parser.yacc" /* yacc.c:1646  */
+    {(yyval.filterNode) = new CFilterScalarFieldFieldOpExprNode((yyvsp[-4].scalarNode), "cond",(yyvsp[-2].filterNode), (yyvsp[0].filterNode));}
+#line 1602 "yacc_parser.cpp" /* yacc.c:1646  */
+    break;
+
+  case 39:
+#line 106 "yacc_parser.yacc" /* yacc.c:1646  */
+    {(yyval.filterNode) = new CFilterFieldScalarScalarOpExprNode((yyvsp[-4].filterNode), "cond",(yyvsp[-2].scalarNode), (yyvsp[0].scalarNode));}
+#line 1608 "yacc_parser.cpp" /* yacc.c:1646  */
+    break;
+
+  case 40:
+#line 107 "yacc_parser.yacc" /* yacc.c:1646  */
+    {(yyval.filterNode) = new CFilterFieldScalarFieldOpExprNode((yyvsp[-4].filterNode), "cond",(yyvsp[-2].scalarNode), (yyvsp[0].filterNode));}
+#line 1614 "yacc_parser.cpp" /* yacc.c:1646  */
+    break;
+
+  case 41:
+#line 108 "yacc_parser.yacc" /* yacc.c:1646  */
+    {(yyval.filterNode) = new CFilterFieldFieldScalarOpExprNode((yyvsp[-4].filterNode), "cond",(yyvsp[-2].filterNode), (yyvsp[0].scalarNode));}
+#line 1620 "yacc_parser.cpp" /* yacc.c:1646  */
+    break;
+
+  case 42:
+#line 109 "yacc_parser.yacc" /* yacc.c:1646  */
+    {(yyval.filterNode) = new CFilterFieldFieldFieldOpExprNode((yyvsp[-4].filterNode), "cond",(yyvsp[-2].filterNode), (yyvsp[0].filterNode));}
+#line 1626 "yacc_parser.cpp" /* yacc.c:1646  */
+    break;
+
+  case 43:
+#line 110 "yacc_parser.yacc" /* yacc.c:1646  */
     { (yyval.filterNode) = new CFilterFieldScalarOpExprNode((yyvsp[-2].filterNode), "add", (yyvsp[0].scalarNode)); }
-#line 1523 "yacc_parser.cpp" /* yacc.c:1646  */
-    break;
-
-  case 34:
-#line 99 "yacc_parser.yacc" /* yacc.c:1646  */
+#line 1632 "yacc_parser.cpp" /* yacc.c:1646  */
+    break;
+
+  case 44:
+#line 111 "yacc_parser.yacc" /* yacc.c:1646  */
     { (yyval.filterNode) = new CFilterScalarFieldOpExprNode((yyvsp[-2].scalarNode), "add", (yyvsp[0].filterNode)); }
-#line 1529 "yacc_parser.cpp" /* yacc.c:1646  */
-    break;
-
-  case 35:
-#line 100 "yacc_parser.yacc" /* yacc.c:1646  */
+#line 1638 "yacc_parser.cpp" /* yacc.c:1646  */
+    break;
+
+  case 45:
+#line 112 "yacc_parser.yacc" /* yacc.c:1646  */
     { (yyval.filterNode) = new CFilterFieldScalarOpExprNode((yyvsp[-2].filterNode), "minus", (yyvsp[0].scalarNode)); }
-#line 1535 "yacc_parser.cpp" /* yacc.c:1646  */
-    break;
-
-  case 36:
-#line 101 "yacc_parser.yacc" /* yacc.c:1646  */
+#line 1644 "yacc_parser.cpp" /* yacc.c:1646  */
+    break;
+
+  case 46:
+#line 113 "yacc_parser.yacc" /* yacc.c:1646  */
     { (yyval.filterNode) = new CFilterScalarFieldOpExprNode((yyvsp[-2].scalarNode), "minus", (yyvsp[0].filterNode)); }
-#line 1541 "yacc_parser.cpp" /* yacc.c:1646  */
-    break;
-
-  case 37:
-#line 102 "yacc_parser.yacc" /* yacc.c:1646  */
+#line 1650 "yacc_parser.cpp" /* yacc.c:1646  */
+    break;
+
+  case 47:
+#line 114 "yacc_parser.yacc" /* yacc.c:1646  */
     { (yyval.filterNode) = new CFilterFieldScalarOpExprNode((yyvsp[-2].filterNode), "mult", (yyvsp[0].scalarNode)); }
-#line 1547 "yacc_parser.cpp" /* yacc.c:1646  */
-    break;
-
-  case 38:
-#line 103 "yacc_parser.yacc" /* yacc.c:1646  */
+#line 1656 "yacc_parser.cpp" /* yacc.c:1646  */
+    break;
+
+  case 48:
+#line 115 "yacc_parser.yacc" /* yacc.c:1646  */
     { (yyval.filterNode) = new CFilterScalarFieldOpExprNode((yyvsp[-2].scalarNode), "mult", (yyvsp[0].filterNode)); }
-#line 1553 "yacc_parser.cpp" /* yacc.c:1646  */
-    break;
-
-  case 39:
-#line 104 "yacc_parser.yacc" /* yacc.c:1646  */
+#line 1662 "yacc_parser.cpp" /* yacc.c:1646  */
+    break;
+
+  case 49:
+#line 116 "yacc_parser.yacc" /* yacc.c:1646  */
     { (yyval.filterNode) = new CFilterFieldScalarOpExprNode((yyvsp[-2].filterNode), "div", (yyvsp[0].scalarNode)); }
-#line 1559 "yacc_parser.cpp" /* yacc.c:1646  */
-    break;
-
-  case 40:
-#line 105 "yacc_parser.yacc" /* yacc.c:1646  */
+#line 1668 "yacc_parser.cpp" /* yacc.c:1646  */
+    break;
+
+  case 50:
+#line 117 "yacc_parser.yacc" /* yacc.c:1646  */
     { (yyval.filterNode) = new CFilterScalarFieldOpExprNode((yyvsp[-2].scalarNode), "div", (yyvsp[0].filterNode)); }
-#line 1565 "yacc_parser.cpp" /* yacc.c:1646  */
-    break;
-
-  case 41:
-#line 106 "yacc_parser.yacc" /* yacc.c:1646  */
+#line 1674 "yacc_parser.cpp" /* yacc.c:1646  */
+    break;
+
+  case 51:
+#line 118 "yacc_parser.yacc" /* yacc.c:1646  */
     { (yyval.filterNode) = new CFilterFieldScalarOpExprNode((yyvsp[-2].filterNode), "pow", (yyvsp[0].scalarNode)); }
-#line 1571 "yacc_parser.cpp" /* yacc.c:1646  */
-    break;
-
-  case 42:
-#line 107 "yacc_parser.yacc" /* yacc.c:1646  */
+#line 1680 "yacc_parser.cpp" /* yacc.c:1646  */
+    break;
+
+  case 52:
+#line 119 "yacc_parser.yacc" /* yacc.c:1646  */
     { (yyval.filterNode) = new CFilterFieldScalarOpExprNode((yyvsp[-2].filterNode), "eq", (yyvsp[0].scalarNode)); }
-#line 1577 "yacc_parser.cpp" /* yacc.c:1646  */
-    break;
-
-  case 43:
-#line 108 "yacc_parser.yacc" /* yacc.c:1646  */
+#line 1686 "yacc_parser.cpp" /* yacc.c:1646  */
+    break;
+
+  case 53:
+#line 120 "yacc_parser.yacc" /* yacc.c:1646  */
     { (yyval.filterNode) = new CFilterScalarFieldOpExprNode((yyvsp[-2].scalarNode), "eq", (yyvsp[0].filterNode)); }
-#line 1583 "yacc_parser.cpp" /* yacc.c:1646  */
-    break;
-
-  case 44:
-#line 109 "yacc_parser.yacc" /* yacc.c:1646  */
+#line 1692 "yacc_parser.cpp" /* yacc.c:1646  */
+    break;
+
+  case 54:
+#line 121 "yacc_parser.yacc" /* yacc.c:1646  */
     { (yyval.filterNode) = new CFilterFieldScalarOpExprNode((yyvsp[-2].filterNode), "lt", (yyvsp[0].scalarNode)); }
-#line 1589 "yacc_parser.cpp" /* yacc.c:1646  */
-    break;
-
-  case 45:
-#line 110 "yacc_parser.yacc" /* yacc.c:1646  */
+#line 1698 "yacc_parser.cpp" /* yacc.c:1646  */
+    break;
+
+  case 55:
+#line 122 "yacc_parser.yacc" /* yacc.c:1646  */
     { (yyval.filterNode) = new CFilterScalarFieldOpExprNode((yyvsp[-2].scalarNode), "lt", (yyvsp[0].filterNode)); }
-#line 1595 "yacc_parser.cpp" /* yacc.c:1646  */
-    break;
-
-  case 46:
-#line 111 "yacc_parser.yacc" /* yacc.c:1646  */
+#line 1704 "yacc_parser.cpp" /* yacc.c:1646  */
+    break;
+
+  case 56:
+#line 123 "yacc_parser.yacc" /* yacc.c:1646  */
     { (yyval.filterNode) = new CFilterFieldScalarOpExprNode((yyvsp[-2].filterNode), "gt", (yyvsp[0].scalarNode)); }
-#line 1601 "yacc_parser.cpp" /* yacc.c:1646  */
-    break;
-
-  case 47:
-#line 112 "yacc_parser.yacc" /* yacc.c:1646  */
+#line 1710 "yacc_parser.cpp" /* yacc.c:1646  */
+    break;
+
+  case 57:
+#line 124 "yacc_parser.yacc" /* yacc.c:1646  */
     { (yyval.filterNode) = new CFilterScalarFieldOpExprNode((yyvsp[-2].scalarNode), "gt", (yyvsp[0].filterNode)); }
-#line 1607 "yacc_parser.cpp" /* yacc.c:1646  */
-    break;
-
-  case 48:
-#line 113 "yacc_parser.yacc" /* yacc.c:1646  */
+#line 1716 "yacc_parser.cpp" /* yacc.c:1646  */
+    break;
+
+  case 58:
+#line 125 "yacc_parser.yacc" /* yacc.c:1646  */
     { (yyval.filterNode) = new CFilterFieldScalarOpExprNode((yyvsp[-2].filterNode), "le", (yyvsp[0].scalarNode)); }
-#line 1613 "yacc_parser.cpp" /* yacc.c:1646  */
-    break;
-
-  case 49:
-#line 114 "yacc_parser.yacc" /* yacc.c:1646  */
+#line 1722 "yacc_parser.cpp" /* yacc.c:1646  */
+    break;
+
+  case 59:
+#line 126 "yacc_parser.yacc" /* yacc.c:1646  */
     { (yyval.filterNode) = new CFilterScalarFieldOpExprNode((yyvsp[-2].scalarNode), "le", (yyvsp[0].filterNode)); }
-#line 1619 "yacc_parser.cpp" /* yacc.c:1646  */
-    break;
-
-  case 50:
-#line 115 "yacc_parser.yacc" /* yacc.c:1646  */
+#line 1728 "yacc_parser.cpp" /* yacc.c:1646  */
+    break;
+
+  case 60:
+#line 127 "yacc_parser.yacc" /* yacc.c:1646  */
     { (yyval.filterNode) = new CFilterFieldScalarOpExprNode((yyvsp[-2].filterNode), "ge", (yyvsp[0].scalarNode)); }
-#line 1625 "yacc_parser.cpp" /* yacc.c:1646  */
-    break;
-
-  case 51:
-#line 116 "yacc_parser.yacc" /* yacc.c:1646  */
+#line 1734 "yacc_parser.cpp" /* yacc.c:1646  */
+    break;
+
+  case 61:
+#line 128 "yacc_parser.yacc" /* yacc.c:1646  */
     { (yyval.filterNode) = new CFilterScalarFieldOpExprNode((yyvsp[-2].scalarNode), "ge", (yyvsp[0].filterNode)); }
-#line 1631 "yacc_parser.cpp" /* yacc.c:1646  */
-    break;
-
-  case 52:
-#line 117 "yacc_parser.yacc" /* yacc.c:1646  */
+#line 1740 "yacc_parser.cpp" /* yacc.c:1646  */
+    break;
+
+  case 62:
+#line 129 "yacc_parser.yacc" /* yacc.c:1646  */
+    { (yyval.filterNode) = new CFilterFieldScalarOpExprNode((yyvsp[-2].filterNode), "ne", (yyvsp[0].scalarNode)); }
+#line 1746 "yacc_parser.cpp" /* yacc.c:1646  */
+    break;
+
+  case 63:
+#line 130 "yacc_parser.yacc" /* yacc.c:1646  */
+    { (yyval.filterNode) = new CFilterScalarFieldOpExprNode((yyvsp[-2].scalarNode), "ne", (yyvsp[0].filterNode)); }
+#line 1752 "yacc_parser.cpp" /* yacc.c:1646  */
+    break;
+
+  case 64:
+#line 131 "yacc_parser.yacc" /* yacc.c:1646  */
     { (yyval.filterNode) = new CFilterUnaryOpExprNode(*(yyvsp[-3].str), (yyvsp[-1].filterNode)); delete (yyvsp[-3].str); }
-#line 1637 "yacc_parser.cpp" /* yacc.c:1646  */
-    break;
-
-
-#line 1641 "yacc_parser.cpp" /* yacc.c:1646  */
+#line 1758 "yacc_parser.cpp" /* yacc.c:1646  */
+    break;
+
+
+#line 1762 "yacc_parser.cpp" /* yacc.c:1646  */
       default: break;
     }
@@ -1866 +1987 @@
   return yyresult;
 }
-#line 119 "yacc_parser.yacc" /* yacc.c:1906  */
+#line 133 "yacc_parser.yacc" /* yacc.c:1906  */
 
 

XIOS/dev/dev_olga/src/parse_expr/yacc_parser.hpp

@@ -60 +60 @@
     LE = 270,
     GE = 271,
-    LEFT_PARENTHESIS = 272,
-    RIGHT_PARENTHESIS = 273,
-    END = 274,
-    NEG = 275
+    NE = 272,
+    LEFT_PARENTHESIS = 273,
+    RIGHT_PARENTHESIS = 274,
+    QUESTION_MARK = 275,
+    COLON = 276,
+    END = 277,
+    NEG = 278
   };
 #endif
@@ -78 +81 @@
   xios::IFilterExprNode* filterNode;
 
-#line 81 "yacc_parser.hpp" /* yacc.c:1909  */
+#line 84 "yacc_parser.hpp" /* yacc.c:1909  */
 };
 # define YYSTYPE_IS_TRIVIAL 1

XIOS/dev/dev_olga/src/parse_expr/yacc_parser.yacc

@@ -42 +42 @@
 %token <str> VAR ID AVERAGE
 %token PLUS MINUS TIMES DIVIDE POWER
-%token EQ LT GT LE GE
+%token EQ LT GT LE GE NE
 %token LEFT_PARENTHESIS RIGHT_PARENTHESIS
+%token QUESTION_MARK COLON
 %token <str> END
 
-%left EQ LT GT LE GE
+%nonassoc QUESTION_MARK COLON
+%left EQ LT GT LE GE NE
 %left PLUS MINUS
 %left TIMES DIVIDE
@@ -77 +79 @@
           | Expression LE Expression  { $$ = new CScalarBinaryOpExprNode($1, "le", $3); }
           | Expression GE Expression  { $$ = new CScalarBinaryOpExprNode($1, "ge", $3); }
+          | Expression NE Expression  { $$ = new CScalarBinaryOpExprNode($1, "ne", $3); }
+          | Expression QUESTION_MARK Expression COLON Expression {$$ = new CScalarTernaryOpExprNode($1, "cond", $3, $5);} 
           | LEFT_PARENTHESIS Expression RIGHT_PARENTHESIS    { $$ = $2; }
           | ID LEFT_PARENTHESIS Expression RIGHT_PARENTHESIS { $$ = new CScalarUnaryOpExprNode(*$1, $3); delete $1; }
@@ -95 +99 @@
           | Field_expr LE Field_expr { $$ = new CFilterFieldFieldOpExprNode($1, "le", $3); }
           | Field_expr GE Field_expr { $$ = new CFilterFieldFieldOpExprNode($1, "ge", $3); }
+          | Field_expr NE Field_expr { $$ = new CFilterFieldFieldOpExprNode($1, "ne", $3); }
           | LEFT_PARENTHESIS Field_expr RIGHT_PARENTHESIS       { $$ = $2; }
+          | Expression QUESTION_MARK Expression COLON Field_expr {$$ = new CFilterScalarScalarFieldOpExprNode($1, "cond",$3, $5);}
+          | Expression QUESTION_MARK Field_expr COLON Expression {$$ = new CFilterScalarFieldScalarOpExprNode($1, "cond",$3, $5);}
+          | Expression QUESTION_MARK Field_expr COLON Field_expr {$$ = new CFilterScalarFieldFieldOpExprNode($1, "cond",$3, $5);}
+          | Field_expr QUESTION_MARK Expression COLON Expression {$$ = new CFilterFieldScalarScalarOpExprNode($1, "cond",$3, $5);}
+          | Field_expr QUESTION_MARK Expression COLON Field_expr {$$ = new CFilterFieldScalarFieldOpExprNode($1, "cond",$3, $5);}
+          | Field_expr QUESTION_MARK Field_expr COLON Expression {$$ = new CFilterFieldFieldScalarOpExprNode($1, "cond",$3, $5);}
+          | Field_expr QUESTION_MARK Field_expr COLON Field_expr {$$ = new CFilterFieldFieldFieldOpExprNode($1, "cond",$3, $5);}
           | Field_expr PLUS Expression   { $$ = new CFilterFieldScalarOpExprNode($1, "add", $3); }
           | Expression PLUS Field_expr   { $$ = new CFilterScalarFieldOpExprNode($1, "add", $3); }
@@ -115 +127 @@
           | Field_expr GE Expression { $$ = new CFilterFieldScalarOpExprNode($1, "ge", $3); }
           | Expression GE Field_expr { $$ = new CFilterScalarFieldOpExprNode($1, "ge", $3); }
+          | Field_expr NE Expression { $$ = new CFilterFieldScalarOpExprNode($1, "ne", $3); }
+          | Expression NE Field_expr { $$ = new CFilterScalarFieldOpExprNode($1, "ne", $3); }
           | ID LEFT_PARENTHESIS Field_expr RIGHT_PARENTHESIS { $$ = new CFilterUnaryOpExprNode(*$1, $3); delete $1; }
           ;