smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 00:34:59 +01:00
Code Issues Projects Releases Wiki Activity

Canvas: reindent Kiwi code, and provide operator<<(ostream&) for several objects

Browse source
This commit is contained in:
Paul Davis 2020-06-10 14:39:52 -06:00
parent ba3515e619
commit 1baa8d68c7
4 changed files with 165 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

82
libs/canvas/kiwi/expression.h
View file

@ -1,11 +1,12 @@
/*-----------------------------------------------------------------------------
| Copyright (c) 2013-2017, Nucleic Development Team.
|
| Distributed under the terms of the Modified BSD License.
|
| The full license is in the file LICENSE, distributed with this software.
|----------------------------------------------------------------------------*/
| Copyright (c) 2013-2017, Nucleic Development Team.
|
| Distributed under the terms of the Modified BSD License.
|
| The full license is in the file LICENSE, distributed with this software.
|----------------------------------------------------------------------------*/
#pragma once
#include <ostream>
#include <vector>
#include "term.h"
@ -15,38 +16,57 @@ namespace kiwi
class Expression
{
public:
Expression(double constant = 0.0) : m_constant(constant) {}
public:
Expression(double constant = 0.0) : m_constant(constant) {}
Expression(const Term &term, double constant = 0.0) : m_terms(1, term), m_constant(constant) {}
Expression(const Term &term, double constant = 0.0) : m_terms(1, term), m_constant(constant) {}
Expression(const std::vector<Term> &terms, double constant = 0.0) : m_terms(terms), m_constant(constant) {}
Expression(const std::vector<Term> &terms, double constant = 0.0) : m_terms(terms), m_constant(constant) {}
~Expression() {}
~Expression() {}
const std::vector<Term> &terms() const
{
return m_terms;
}
const std::vector<Term> &terms() const
{
return m_terms;
}
double constant() const
{
return m_constant;
}
double constant() const
{
return m_constant;
}
double value() const
{
typedef std::vector<Term>::const_iterator iter_t;
double result = m_constant;
iter_t end = m_terms.end();
for (iter_t it = m_terms.begin(); it != end; ++it)
result += it->value();
return result;
}
double value() const
{
typedef std::vector<Term>::const_iterator iter_t;
double result = m_constant;
iter_t end = m_terms.end();
for (iter_t it = m_terms.begin(); it != end; ++it)
result += it->value();
return result;
}
private:
std::vector<Term> m_terms;
double m_constant;
bool involves (Variable const & v) const {
for (std::vector<Term>::const_iterator it = m_terms.begin(); it != m_terms.end(); ++it) {
if (it->variable().equals (v)) {
return true;
}
}
return false;
}
private:
std::vector<Term> m_terms;
double m_constant;
};
static std::ostream& operator<<(std::ostream& o, kiwi::Expression const &e)
{
o << e.constant() << " + ";
for (std::vector<kiwi::Term>::const_iterator it = e.terms().begin(); it != e.terms().end(); ++it) {
o << (*it) << ' ';
}
return o;
}
} // namespace kiwi