Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/v90-bugfix'
Browse files Browse the repository at this point in the history
  • Loading branch information
scip-ci committed Jan 19, 2024
2 parents 24711fd + eecc230 commit ec54ab6
Show file tree
Hide file tree
Showing 17 changed files with 1,080 additions and 453 deletions.
1 change: 1 addition & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ Interface changes
`option scip_options 'limits/time 10 display/verblevel 1';`.
String values should not be quoted and spaces in string values are not supported.
- sassy can be used now as preprocessor for nauty/traces
- The solution status codes written to AMPL solution files now match those from https://mp.ampl.com/details.html#_CPPv4N2mp3sol6StatusE.

### Changed parameters

Expand Down
14 changes: 8 additions & 6 deletions src/amplmp/include/mp/basic-expr-visitor.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,16 @@

namespace mp {

// A basic expression visitor that can be used with different expression
// hierarchies described by ExprTypes.
//
// BasicExprVisitor uses the curiously recurring template pattern:
// http://en.wikipedia.org/wiki/Curiously_recurring_template_pattern
/// A basic expression visitor that can be used with different expression
/// hierarchies described by ExprTypes.
///
/// BasicExprVisitor uses the curiously recurring template pattern:
/// http://en.wikipedia.org/wiki/Curiously_recurring_template_pattern
template <typename Impl, typename Result, typename ExprTypes>
class BasicExprVisitor {
public:
virtual ~BasicExprVisitor() { }

MP_DEFINE_EXPR_TYPES(ExprTypes);

Result Visit(Expr e);
Expand Down Expand Up @@ -181,7 +183,7 @@ class BasicExprVisitor {
return MP_DISPATCH(VisitUnary(e));
}

// Visits a binary expression or a function taking two arguments.
/// Visits a binary expression or a function taking two arguments.
Result VisitBinary(BinaryExpr e) {
return MP_DISPATCH(VisitNumeric(e));
}
Expand Down
Loading

0 comments on commit ec54ab6

Please sign in to comment.