Skip to content

Formatting Fix Composer-Dev #6

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
reid-g merged 3 commits into from
Apr 10, 2024
Merged

Formatting Fix Composer-Dev #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c5f702d
Merge Ida Fix
reid-g Apr 9, 2024
c7a0ff3
Fixed Whitespace Editor Changes
reid-g Apr 9, 2024
8a7fbff
Tabs to Spaces Ida.cpp
reid-g Apr 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 51 additions & 48 deletions ModelEvaluatorImpl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,28 +77,27 @@ namespace ModelLib
typedef typename ModelEvaluator<ScalarT, IdxT>::real_type real_type;

ModelEvaluatorImpl()
: size_(0),
size_quad_(0),
size_opt_(0)
{
}
: size_(0),
size_quad_(0),
size_opt_(0)
{}

ModelEvaluatorImpl(IdxT size, IdxT size_quad, IdxT size_opt)
: size_(size),
size_quad_(size_quad),
size_opt_(size_opt),
y_(size_),
yp_(size_),
f_(size_),
g_(size_quad_),
yB_(size_),
ypB_(size_),
fB_(size_),
gB_(size_opt_),
J_(COO_Matrix<ScalarT, IdxT>()),
param_(size_opt_),
param_up_(size_opt_),
param_lo_(size_opt_)
: size_(size),
size_quad_(size_quad),
size_opt_(size_opt),
y_(size_),
yp_(size_),
f_(size_),
g_(size_quad_),
yB_(size_),
ypB_(size_),
fB_(size_),
gB_(size_opt_),
J_(COO_Matrix<ScalarT, IdxT>()),
param_(size_opt_),
param_up_(size_opt_),
param_lo_(size_opt_)
{
}

Expand Down Expand Up @@ -134,143 +133,143 @@ namespace ModelLib
// std::cout << "updateTime: t = " << time_ << "\n";
// }

virtual void setTolerances(real_type &rtol, real_type &atol) const
virtual void setTolerances(real_type& rtol, real_type& atol) const
{
rtol = rtol_;
atol = atol_;
}

virtual void setMaxSteps(IdxT &msa) const
virtual void setMaxSteps(IdxT& msa) const
{
msa = max_steps_;
}

std::vector<ScalarT> &y()
std::vector<ScalarT>& y()
{
return y_;
}

const std::vector<ScalarT> &y() const
const std::vector<ScalarT>& y() const
{
return y_;
}

std::vector<ScalarT> &yp()
std::vector<ScalarT>& yp()
{
return yp_;
}

const std::vector<ScalarT> &yp() const
const std::vector<ScalarT>& yp() const
{
return yp_;
}

std::vector<bool> &tag()
std::vector<bool>& tag()
{
return tag_;
}

const std::vector<bool> &tag() const
const std::vector<bool>& tag() const
{
return tag_;
}

std::vector<ScalarT> &yB()
std::vector<ScalarT>& yB()
{
return yB_;
}

const std::vector<ScalarT> &yB() const
const std::vector<ScalarT>& yB() const
{
return yB_;
}

std::vector<ScalarT> &ypB()
std::vector<ScalarT>& ypB()
{
return ypB_;
}

const std::vector<ScalarT> &ypB() const
const std::vector<ScalarT>& ypB() const
{
return ypB_;
}

std::vector<ScalarT> &param()
std::vector<ScalarT>& param()
{
return param_;
}

const std::vector<ScalarT> &param() const
const std::vector<ScalarT>& param() const
{
return param_;
}

std::vector<ScalarT> &param_up()
std::vector<ScalarT>& param_up()
{
return param_up_;
}

const std::vector<ScalarT> &param_up() const
const std::vector<ScalarT>& param_up() const
{
return param_up_;
}

std::vector<ScalarT> &param_lo()
std::vector<ScalarT>& param_lo()
{
return param_lo_;
}

const std::vector<ScalarT> &param_lo() const
const std::vector<ScalarT>& param_lo() const
{
return param_lo_;
}

std::vector<ScalarT> &getResidual()
std::vector<ScalarT>& getResidual()
{
return f_;
}

const std::vector<ScalarT> &getResidual() const
const std::vector<ScalarT>& getResidual() const
{
return f_;
}

COO_Matrix<ScalarT, IdxT> &getJacobian()
COO_Matrix<ScalarT, IdxT>& getJacobian()
{
return J_;
}

const COO_Matrix<ScalarT, IdxT> &getJacobian() const
const COO_Matrix<ScalarT, IdxT>& getJacobian() const
{
return J_;
}

std::vector<ScalarT> &getIntegrand()
std::vector<ScalarT>& getIntegrand()
{
return g_;
}

const std::vector<ScalarT> &getIntegrand() const
const std::vector<ScalarT>& getIntegrand() const
{
return g_;
}

std::vector<ScalarT> &getAdjointResidual()
std::vector<ScalarT>& getAdjointResidual()
{
return fB_;
}

const std::vector<ScalarT> &getAdjointResidual() const
const std::vector<ScalarT>& getAdjointResidual() const
{
return fB_;
}

std::vector<ScalarT> &getAdjointIntegrand()
std::vector<ScalarT>& getAdjointIntegrand()
{
return gB_;
}

const std::vector<ScalarT> &getAdjointIntegrand() const
const std::vector<ScalarT>& getAdjointIntegrand() const
{
return gB_;
}
Expand All @@ -281,6 +280,8 @@ namespace ModelLib
return idc_;
}



protected:
IdxT size_;
IdxT nnz_;
Expand Down Expand Up @@ -313,8 +314,10 @@ namespace ModelLib
IdxT max_steps_;

IdxT idc_;

};


} // namespace ModelLib

#endif // _MODEL_EVALUATOR_IMPL_HPP_
Loading