Skip to content

Commit

Permalink
Move parameter up one level in fista/poisson
Browse files Browse the repository at this point in the history
  • Loading branch information
philippeganz committed Nov 5, 2017
1 parent 2e0d617 commit 1067d0f
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 42 deletions.
3 changes: 2 additions & 1 deletion ASTROQUT.cbp
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,13 @@
<Add directory="include" />
</Linker>
<Unit filename=".gitignore" />
<Unit filename="include/WS.hpp" />
<Unit filename="include/const.hpp" />
<Unit filename="include/datacontainer.hpp" />
<Unit filename="include/fista/poisson.hpp" />
<Unit filename="include/fista/poisson/parameters.hpp" />
<Unit filename="include/test.hpp" />
<Unit filename="include/test/container.hpp" />
<Unit filename="include/test/datacontainer.hpp" />
<Unit filename="include/test/fista.hpp" />
<Unit filename="src/fista/poisson.cpp" />
<Unit filename="src/main.cpp" />
Expand Down
21 changes: 20 additions & 1 deletion include/fista/poisson.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
#define ASTROQUT_FISTA_POISSON_HPP

#include "datacontainer.hpp"
#include "fista/poisson/parameters.hpp"

#include <iostream>
#include <iomanip>
Expand All @@ -21,6 +20,26 @@ namespace astroqut{
namespace fista{
namespace poisson{

struct Parameters
{
/** Default constructor
* Parameters with default values
*/
Parameters() noexcept
: tol(1e-6)
, max_iter(2000)
, init_value(DataContainer<double>())
, log(true)
, log_period(10)
{}

double tol; //!< Member variable "tol"
size_t max_iter = 2000; //!< Member variable "max_iter"
DataContainer<double> init_value; //!< Member variable "init_value"
bool log; //!< Member variable "log"
unsigned int log_period; //!< Member variable "log_period"
};

/** Poisson distributed noise solver
* \param model Explicit regression matrix
* \param background Background shift
Expand Down
39 changes: 0 additions & 39 deletions include/fista/poisson/parameters.hpp

This file was deleted.

1 change: 0 additions & 1 deletion include/test/fista.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#include <random>

#include "fista/poisson.hpp"
#include "fista/poisson/parameters.hpp"

namespace astroqut{
namespace test{
Expand Down

0 comments on commit 1067d0f

Please sign in to comment.