Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Clean up container.h / container.hxx #2601

Merged
merged 1 commit into from
Jan 28, 2025
Merged

Clean up container.h / container.hxx #2601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 0 additions & 12 deletions src/solver/variable/include/antares/solver/variable/container.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,18 +55,6 @@ class List: public NextT
};

public:
//! \name Constructor & Destructor
//@{
/*!
** \brief Default Constructor
*/
List();
/*!
** \brief Destructor
*/
~List();
//@}

//! \name Variable initialization
//@{
/*!
Expand Down
22 changes: 6 additions & 16 deletions src/solver/variable/include/antares/solver/variable/container.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,6 @@ namespace Variable
{
namespace Container
{
template<class NextT>
inline List<NextT>::List()
{
}

template<class NextT>
inline List<NextT>::~List()
{
}

template<class NextT>
inline void List<NextT>::initializeFromStudy(Data::Study& study)
{
Expand Down Expand Up @@ -326,32 +316,32 @@ void List<NextT>::exportSurveyResults(bool global,
logs.info() << "Exporting the annual results";
}

auto survey = std::make_shared<SurveyResults>(*pStudy, output, writer);
SurveyResults survey(*pStudy, output, writer);

// Year by year ?
survey->yearByYearResults = !global;
survey.yearByYearResults = !global;

if (global)
{
// alias to the type of the report builder
using Builder = SurveyReportBuilder<true, ListType>;
// Building the survey results for each possible state
Builder::Run(*this, *survey);
Builder::Run(*this, survey);

// Exporting the Grid (information about the study)
survey->exportGridInfos();
survey.exportGridInfos();

// Exporting the digest
// The digest must be exported after the real report because some values
// are computed at this moment.
Builder::RunDigest(*this, *survey, writer);
Builder::RunDigest(*this, survey, writer);
}
else
{
// alias to the type of the report builder
using Builder = SurveyReportBuilder<false, ListType>;
// Building the survey results for each possible state
Builder::Run(*this, *survey, numSpace);
Builder::Run(*this, survey, numSpace);
}
}

Expand Down
Loading