diff --git a/annotated.html b/annotated.html index a32cb967e..c5ba60c95 100644 --- a/annotated.html +++ b/annotated.html @@ -138,41 +138,43 @@
References a, b, sopt::bisection_method(), sopt::logging::set_level(), and tol.
+References a, b, sopt::bisection_method(), sopt::logging::set_level(), and tol.
diff --git a/bisection__method_8cc__incl.map b/bisection__method_8cc__incl.map index 6fac10b39..451aac92a 100644 --- a/bisection__method_8cc__incl.map +++ b/bisection__method_8cc__incl.map @@ -1,21 +1,22 @@ diff --git a/bisection__method_8cc__incl.md5 b/bisection__method_8cc__incl.md5 index d2eab088b..801268855 100644 --- a/bisection__method_8cc__incl.md5 +++ b/bisection__method_8cc__incl.md5 @@ -1 +1 @@ -fd17cee29e121f2382d0373b1b14d42f \ No newline at end of file +f35b343675cbf5ec243e421161df7762 \ No newline at end of file diff --git a/bisection__method_8cc__incl.png b/bisection__method_8cc__incl.png index d7fa6ff48..ec17e1aac 100644 Binary files a/bisection__method_8cc__incl.png and b/bisection__method_8cc__incl.png differ diff --git a/bisection__method_8cc_source.html b/bisection__method_8cc_source.html index ced4a581b..6b3ace008 100644 --- a/bisection__method_8cc_source.html +++ b/bisection__method_8cc_source.html @@ -96,7 +96,7 @@ - + @@ -124,7 +124,7 @@ -References SOPT_LOW_LOG.
+References SOPT_LOW_LOG.
diff --git a/classsopt_1_1ScalarRelativeVariation.html b/classsopt_1_1ScalarRelativeVariation.html index ac389c49b..8a8976179 100644 --- a/classsopt_1_1ScalarRelativeVariation.html +++ b/classsopt_1_1ScalarRelativeVariation.html @@ -441,10 +441,10 @@References sopt::gradient_operator::diff(), and SOPT_LOW_LOG.
+References sopt::gradient_operator::diff(), and SOPT_LOW_LOG.
diff --git a/classsopt_1_1algorithm_1_1JointMAP.html b/classsopt_1_1algorithm_1_1JointMAP.html index 3e2397b0b..4c6fdb56e 100644 --- a/classsopt_1_1algorithm_1_1JointMAP.html +++ b/classsopt_1_1algorithm_1_1JointMAP.html @@ -276,13 +276,13 @@References sopt::algorithm::JointMAP< ALGORITHM >::DiagnosticAndResultReg::reg_good, sopt::algorithm::JointMAP< ALGORITHM >::DiagnosticAndResultReg::reg_niters, sopt::algorithm::JointMAP< ALGORITHM >::DiagnosticAndResultReg::reg_term, SOPT_ERROR, SOPT_HIGH_LOG, SOPT_LOW_LOG, and SOPT_MEDIUM_LOG.
+References sopt::algorithm::JointMAP< ALGORITHM >::DiagnosticAndResultReg::reg_good, sopt::algorithm::JointMAP< ALGORITHM >::DiagnosticAndResultReg::reg_niters, sopt::algorithm::JointMAP< ALGORITHM >::DiagnosticAndResultReg::reg_term, SOPT_ERROR, SOPT_HIGH_LOG, SOPT_LOW_LOG, and SOPT_MEDIUM_LOG.
diff --git a/classsopt_1_1algorithm_1_1L1GProximal.html b/classsopt_1_1algorithm_1_1L1GProximal.html index e9cd87cbc..d731e26f1 100644 --- a/classsopt_1_1algorithm_1_1L1GProximal.html +++ b/classsopt_1_1algorithm_1_1L1GProximal.html @@ -469,9 +469,9 @@References SOPT_HIGH_LOG.
+References SOPT_HIGH_LOG.
diff --git a/classsopt_1_1algorithm_1_1L2ForwardBackward.html b/classsopt_1_1algorithm_1_1L2ForwardBackward.html index 0ac4346da..e0345a358 100644 --- a/classsopt_1_1algorithm_1_1L2ForwardBackward.html +++ b/classsopt_1_1algorithm_1_1L2ForwardBackward.html @@ -1030,7 +1030,7 @@Referenced by main().
+Referenced by main().
diff --git a/classsopt_1_1algorithm_1_1PowerMethod.html b/classsopt_1_1algorithm_1_1PowerMethod.html index a1befd60c..ec06ba0d4 100644 --- a/classsopt_1_1algorithm_1_1PowerMethod.html +++ b/classsopt_1_1algorithm_1_1PowerMethod.html @@ -455,11 +455,11 @@References SOPT_INFO, and SOPT_WARN.
+References SOPT_INFO, and SOPT_WARN.
diff --git a/classsopt_1_1algorithm_1_1Reweighted.html b/classsopt_1_1algorithm_1_1Reweighted.html index 43f6f61c5..131f028df 100644 --- a/classsopt_1_1algorithm_1_1Reweighted.html +++ b/classsopt_1_1algorithm_1_1Reweighted.html @@ -941,13 +941,13 @@References sopt::algorithm::Reweighted< ALGORITHM >::ReweightedResult::algo, sopt::algorithm::Reweighted< ALGORITHM >::ReweightedResult::good, sopt::algorithm::Reweighted< ALGORITHM >::ReweightedResult::niters, SOPT_ERROR, SOPT_HIGH_LOG, SOPT_LOW_LOG, SOPT_MEDIUM_LOG, sopt::standard_deviation(), and sopt::algorithm::Reweighted< ALGORITHM >::ReweightedResult::weights.
+References sopt::algorithm::Reweighted< ALGORITHM >::ReweightedResult::algo, sopt::algorithm::Reweighted< ALGORITHM >::ReweightedResult::good, sopt::algorithm::Reweighted< ALGORITHM >::ReweightedResult::niters, SOPT_ERROR, SOPT_HIGH_LOG, SOPT_LOW_LOG, SOPT_MEDIUM_LOG, sopt::standard_deviation(), and sopt::algorithm::Reweighted< ALGORITHM >::ReweightedResult::weights.
diff --git a/classsopt_1_1algorithm_1_1SDMM.html b/classsopt_1_1algorithm_1_1SDMM.html index 46d2b7615..95b77b4e5 100644 --- a/classsopt_1_1algorithm_1_1SDMM.html +++ b/classsopt_1_1algorithm_1_1SDMM.html @@ -952,11 +952,11 @@References a, SOPT_HIGH_LOG, and SOPT_LOW_LOG.
+References a, SOPT_HIGH_LOG, and SOPT_LOW_LOG.
diff --git a/classsopt_1_1algorithm_1_1TFGProximal.html b/classsopt_1_1algorithm_1_1TFGProximal.html index 4220de81c..332c4079e 100644 --- a/classsopt_1_1algorithm_1_1TFGProximal.html +++ b/classsopt_1_1algorithm_1_1TFGProximal.html @@ -405,9 +405,9 @@References SOPT_HIGH_LOG.
+References SOPT_HIGH_LOG.
diff --git a/classsopt_1_1algorithm_1_1TVPrimalDual.html b/classsopt_1_1algorithm_1_1TVPrimalDual.html index 1e4f8d4ac..55f2a405f 100644 --- a/classsopt_1_1algorithm_1_1TVPrimalDual.html +++ b/classsopt_1_1algorithm_1_1TVPrimalDual.html @@ -995,7 +995,7 @@Referenced by main(), and sopt::algorithm::TVPrimalDual< SCALAR >::operator()().
+Referenced by main(), and sopt::algorithm::TVPrimalDual< SCALAR >::operator()().
@@ -1033,7 +1033,7 @@Referenced by main().
+Referenced by main().
@@ -1071,7 +1071,7 @@Referenced by main().
+Referenced by main().
diff --git a/classsopt_1_1logging_1_1Log-members.html b/classsopt_1_1logging_1_1Log-members.html new file mode 100644 index 000000000..decd9d774 --- /dev/null +++ b/classsopt_1_1logging_1_1Log-members.html @@ -0,0 +1,115 @@ + + + + + + + ++ |
+ SOPT
+
+ Sparse OPTimisation
+ |
+
This is the complete list of members for sopt::logging::Log, including all inherited members.
++ |
+ SOPT
+
+ Sparse OPTimisation
+ |
+
Logging system for controlled & formatted writing to stdout. + More...
+ +#include <logging.h>
+Public Types | |
enum | Level { + trace = 0 +, debug = 10 +, info = 20 +, warn = 30 +, + warning = 30 +, error = 40 +, critical = 50 +, always = 50 + + } |
Log priority levels. More... | |
using | LogMap = std::map< std::string, Log > |
Typedef for a collection of named logs. More... | |
using | LevelMap = std::map< std::string, int > |
Typedef for a collection of named log levels. More... | |
using | ColorCodes = std::map< int, std::string > |
Typedef for a collection of shell color codes, accessed by log level. More... | |
+Public Member Functions | |
int | getLevel () const |
Get the priority level of this logger. More... | |
Log & | setLevel (int level) |
Set the priority level of this logger. More... | |
std::string | getName () const |
Get the name of this logger. More... | |
Log & | setName (const std::string &name) |
Set the name of this logger. More... | |
bool | isActive (int level) const |
Will this log level produce output on this logger at the moment? More... | |
+Static Public Member Functions | |
static void | setLevel (const std::string &name, int level) |
Set the log levels. More... | |
static void | setLevels (const LevelMap &logLevels) |
static Log & | getLog (const std::string &name) |
static Level | getLevelFromName (const std::string &level) |
Get a log level enum from a string. More... | |
static std::string | getLevelName (int level) |
Get the std::string representation of a log level. More... | |
+Static Public Attributes | |
static const int | end_color {-10} |
Special "level-like" code to end coloring. More... | |
+Friends | |
std::ostream & | operator<< (Log &log, int level) |
The streaming operator can use Log's internals. More... | |
Logging system for controlled & formatted writing to stdout.
+ + +using sopt::logging::Log::ColorCodes = std::map<int, std::string> | +
using sopt::logging::Log::LevelMap = std::map<std::string, int> | +
using sopt::logging::Log::LogMap = std::map<std::string, Log> | +
enum sopt::logging::Log::Level | +
+
|
+ +inline | +
+
|
+ +static | +
Get a log level enum from a string.
+ +Definition at line 138 of file logging.cc.
+References SOPT_THROW.
+ +Referenced by sopt::logging::set_level().
+ +
+
|
+ +static | +
Get the std::string representation of a log level.
+ +Definition at line 95 of file logging.cc.
+
+
|
+ +static | +
Get a logger with the given name. The level will be taken from the "requestedLevels" static map or will be INFO by default.
+ +Definition at line 57 of file logging.cc.
+References getLevel().
+ +Referenced by sopt::logging::getLog().
+ +
+
|
+ +inline | +
+
|
+ +inline | +
+
|
+ +static | +
Set the log levels.
+ +Referenced by sopt::logging::set_level().
+ +
+
|
+ +inline | +
+
|
+ +static | +
Definition at line 49 of file logging.cc.
+References sopt::logging::_updateLevels().
+ +
+
|
+ +inline | +
+
|
+ +friend | +
The streaming operator can use Log's internals.
+ +Definition at line 190 of file logging.cc.
+
+
|
+ +static | +
References sopt::soft_threshhold(), and SOPT_LOW_LOG.
+References sopt::soft_threshhold(), and SOPT_LOW_LOG.
Referenced by sopt::proximal::L1< SCALAR >::tight_frame().
diff --git a/classsopt_1_1wavelets_1_1SARA.html b/classsopt_1_1wavelets_1_1SARA.html index e744d64a4..742acfc04 100644 --- a/classsopt_1_1wavelets_1_1SARA.html +++ b/classsopt_1_1wavelets_1_1SARA.html @@ -467,11 +467,11 @@References SOPT_TRACE, and SOPT_WAVELET_ERROR_MACRO.
+References SOPT_TRACE, and SOPT_WAVELET_ERROR_MACRO.
@@ -632,7 +632,7 @@References max_levels(), SOPT_TRACE, and SOPT_WAVELET_ERROR_MACRO.
+References max_levels(), SOPT_TRACE, and SOPT_WAVELET_ERROR_MACRO.
diff --git a/classsopt_1_1wavelets_1_1Wavelet.html b/classsopt_1_1wavelets_1_1Wavelet.html index 9e57b7361..0de390ba7 100644 --- a/classsopt_1_1wavelets_1_1Wavelet.html +++ b/classsopt_1_1wavelets_1_1Wavelet.html @@ -668,7 +668,7 @@References sopt::logging::initialize(), and mersenne().
+References mersenne().
diff --git a/common__catch__main_8cc__incl.map b/common__catch__main_8cc__incl.map index ecaf8b2fc..19202a2f5 100644 --- a/common__catch__main_8cc__incl.map +++ b/common__catch__main_8cc__incl.map @@ -1,10 +1,14 @@ diff --git a/common__catch__main_8cc__incl.md5 b/common__catch__main_8cc__incl.md5 index a28078c9f..b450ef11d 100644 --- a/common__catch__main_8cc__incl.md5 +++ b/common__catch__main_8cc__incl.md5 @@ -1 +1 @@ -8e9473839420b21dad02707123867d04 \ No newline at end of file +1b0400968f5085c698b7168d9ac59f72 \ No newline at end of file diff --git a/common__catch__main_8cc__incl.png b/common__catch__main_8cc__incl.png index bef6ba9e0..589595739 100644 Binary files a/common__catch__main_8cc__incl.png and b/common__catch__main_8cc__incl.png differ diff --git a/common__catch__main_8cc_source.html b/common__catch__main_8cc_source.html index f67bdcc03..68fca8eef 100644 --- a/common__catch__main_8cc_source.html +++ b/common__catch__main_8cc_source.html @@ -97,14 +97,11 @@ - - - - + +References cargs, sopt::mpi::init(), sopt::logging::initialize(), and mersenne().
+References cargs, sopt::mpi::init(), and mersenne().
diff --git a/common__mpi__catch__main_8cc__incl.map b/common__mpi__catch__main_8cc__incl.map index 1a2c23b54..8448b7988 100644 --- a/common__mpi__catch__main_8cc__incl.map +++ b/common__mpi__catch__main_8cc__incl.map @@ -1,13 +1,17 @@ diff --git a/common__mpi__catch__main_8cc__incl.md5 b/common__mpi__catch__main_8cc__incl.md5 index ce591dc46..8fb9078bc 100644 --- a/common__mpi__catch__main_8cc__incl.md5 +++ b/common__mpi__catch__main_8cc__incl.md5 @@ -1 +1 @@ -194afaa79d61f33586f3a4884a623181 \ No newline at end of file +2c6bbf43bd406dacc3233d2f80d14096 \ No newline at end of file diff --git a/common__mpi__catch__main_8cc__incl.png b/common__mpi__catch__main_8cc__incl.png index 008accee6..93191e5c3 100644 Binary files a/common__mpi__catch__main_8cc__incl.png and b/common__mpi__catch__main_8cc__incl.png differ diff --git a/common__mpi__catch__main_8cc_source.html b/common__mpi__catch__main_8cc_source.html index 8eb024ead..8a7e79b81 100644 --- a/common__mpi__catch__main_8cc_source.html +++ b/common__mpi__catch__main_8cc_source.html @@ -126,17 +126,14 @@ - + - - - - + +References sopt::logging::initialize(), sopt::notinstalled::read_standard_tiff(), sopt::utilities::read_tiff(), and sopt::utilities::write_tiff().
+References sopt::notinstalled::read_standard_tiff(), sopt::utilities::read_tiff(), and sopt::utilities::write_tiff().
diff --git a/copy__tiff_8cc__incl.map b/copy__tiff_8cc__incl.map index 2519cc081..1ed8b7159 100644 --- a/copy__tiff_8cc__incl.map +++ b/copy__tiff_8cc__incl.map @@ -1,22 +1,25 @@ diff --git a/copy__tiff_8cc__incl.md5 b/copy__tiff_8cc__incl.md5 index fdea31249..f1da02514 100644 --- a/copy__tiff_8cc__incl.md5 +++ b/copy__tiff_8cc__incl.md5 @@ -1 +1 @@ -087736bdf9d4e512b407fae219b94f48 \ No newline at end of file +cc3a3286c9c84e6ab7769d30ce3bd1eb \ No newline at end of file diff --git a/copy__tiff_8cc__incl.png b/copy__tiff_8cc__incl.png index e1369bae4..57fb06df9 100644 Binary files a/copy__tiff_8cc__incl.png and b/copy__tiff_8cc__incl.png differ diff --git a/copy__tiff_8cc_source.html b/copy__tiff_8cc_source.html index e4a68a7a3..860c449d3 100644 --- a/copy__tiff_8cc_source.html +++ b/copy__tiff_8cc_source.html @@ -100,21 +100,16 @@ - - - + + + - - - - - - - - + + + + -References sopt::credible_region::compute_energy_upper_bound(), N, and sopt::logging::set_level().
+References sopt::credible_region::compute_energy_upper_bound(), N, and sopt::logging::set_level().
diff --git a/credible__region_8cc__incl.map b/credible__region_8cc__incl.map index def0b4ff7..b31094839 100644 --- a/credible__region_8cc__incl.map +++ b/credible__region_8cc__incl.map @@ -1,29 +1,30 @@ diff --git a/credible__region_8cc__incl.md5 b/credible__region_8cc__incl.md5 index 3c5cc408e..73b0dacc9 100644 --- a/credible__region_8cc__incl.md5 +++ b/credible__region_8cc__incl.md5 @@ -1 +1 @@ -59be5ba3d153a89d04d877bedae5f65f \ No newline at end of file +75e204d7a9fd010368fa7c598747bc2d \ No newline at end of file diff --git a/credible__region_8cc__incl.png b/credible__region_8cc__incl.png index 7817885b4..391108f63 100644 Binary files a/credible__region_8cc__incl.png and b/credible__region_8cc__incl.png differ diff --git a/credible__region_8cc_source.html b/credible__region_8cc_source.html index da1be8ed9..5b8326b45 100644 --- a/credible__region_8cc_source.html +++ b/credible__region_8cc_source.html @@ -95,7 +95,7 @@ - + @@ -197,7 +197,7 @@References sopt::LinearTransform< VECTOR >::adjoint(), sopt::dirty(), sopt::epsilon(), sopt::wavelets::factory(), sopt::algorithm::ImagingForwardBackward< SCALAR >::g_proximal(), sopt::logging::initialize(), mersenne(), sopt::algorithm::ImagingForwardBackward< SCALAR >::Phi(), sopt::notinstalled::read_standard_tiff(), sopt::logging::set_level(), sopt::sigma(), SOPT_HIGH_LOG, SOPT_LOW_LOG, and sopt::utilities::write_tiff().
+References sopt::LinearTransform< VECTOR >::adjoint(), sopt::dirty(), sopt::epsilon(), sopt::wavelets::factory(), sopt::algorithm::ImagingForwardBackward< SCALAR >::g_proximal(), mersenne(), sopt::algorithm::ImagingForwardBackward< SCALAR >::Phi(), sopt::notinstalled::read_standard_tiff(), sopt::logging::set_level(), sopt::sigma(), SOPT_HIGH_LOG, SOPT_LOW_LOG, and sopt::utilities::write_tiff().
diff --git a/examples_2forward__backward_2inpainting_8cc__incl.map b/examples_2forward__backward_2inpainting_8cc__incl.map index 853957f83..b976563f2 100644 --- a/examples_2forward__backward_2inpainting_8cc__incl.map +++ b/examples_2forward__backward_2inpainting_8cc__incl.map @@ -1,51 +1,52 @@ diff --git a/examples_2forward__backward_2inpainting_8cc__incl.md5 b/examples_2forward__backward_2inpainting_8cc__incl.md5 index 55704f679..066a9f1c7 100644 --- a/examples_2forward__backward_2inpainting_8cc__incl.md5 +++ b/examples_2forward__backward_2inpainting_8cc__incl.md5 @@ -1 +1 @@ -7a62c16e3d23dfbd5b58c74579534022 \ No newline at end of file +56ccf4f3db93a6c7b48978f43b566bb5 \ No newline at end of file diff --git a/examples_2forward__backward_2inpainting_8cc__incl.png b/examples_2forward__backward_2inpainting_8cc__incl.png index 9f3ef85a0..1fcf7659e 100644 Binary files a/examples_2forward__backward_2inpainting_8cc__incl.png and b/examples_2forward__backward_2inpainting_8cc__incl.png differ diff --git a/examples_2forward__backward_2inpainting_8cc_source.html b/examples_2forward__backward_2inpainting_8cc_source.html index eeaffc623..ef8bde42b 100644 --- a/examples_2forward__backward_2inpainting_8cc_source.html +++ b/examples_2forward__backward_2inpainting_8cc_source.html @@ -133,86 +133,85 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -226,11 +225,10 @@ - - + + -References sopt::logging::initialize(), sopt::proximal::L1< SCALAR >::nu(), sopt::positive_quadrant(), and SOPT_THROW.
+References sopt::proximal::L1< SCALAR >::nu(), sopt::positive_quadrant(), and SOPT_THROW.
diff --git a/examples_2l1__proximal_8cc__incl.map b/examples_2l1__proximal_8cc__incl.map index d53183e0b..dfba3a4ba 100644 --- a/examples_2l1__proximal_8cc__incl.map +++ b/examples_2l1__proximal_8cc__incl.map @@ -1,25 +1,26 @@ diff --git a/examples_2l1__proximal_8cc__incl.md5 b/examples_2l1__proximal_8cc__incl.md5 index 46093df87..32b8c3049 100644 --- a/examples_2l1__proximal_8cc__incl.md5 +++ b/examples_2l1__proximal_8cc__incl.md5 @@ -1 +1 @@ -e90dfce1a98b9f728bcba1a9349802c7 \ No newline at end of file +6128f2f574950265506534543b783929 \ No newline at end of file diff --git a/examples_2l1__proximal_8cc__incl.png b/examples_2l1__proximal_8cc__incl.png index a290d3ca0..824114155 100644 Binary files a/examples_2l1__proximal_8cc__incl.png and b/examples_2l1__proximal_8cc__incl.png differ diff --git a/examples_2l1__proximal_8cc_source.html b/examples_2l1__proximal_8cc_source.html index f30577166..f3d9e309e 100644 --- a/examples_2l1__proximal_8cc_source.html +++ b/examples_2l1__proximal_8cc_source.html @@ -84,45 +84,44 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -131,7 +130,6 @@ -References sopt::dirty(), sopt::epsilon(), sopt::wavelets::factory(), sopt::logging::initialize(), mersenne(), sopt::algorithm::ImagingPrimalDual< SCALAR >::Phi(), sopt::algorithm::ImagingPrimalDual< SCALAR >::Psi(), sopt::notinstalled::read_standard_tiff(), sopt::algorithm::ImagingPrimalDual< SCALAR >::residual_convergence(), sopt::sigma(), SOPT_HIGH_LOG, and sopt::utilities::write_tiff().
+References sopt::dirty(), sopt::epsilon(), sopt::wavelets::factory(), mersenne(), sopt::algorithm::ImagingPrimalDual< SCALAR >::Phi(), sopt::algorithm::ImagingPrimalDual< SCALAR >::Psi(), sopt::notinstalled::read_standard_tiff(), sopt::algorithm::ImagingPrimalDual< SCALAR >::residual_convergence(), sopt::sigma(), SOPT_HIGH_LOG, and sopt::utilities::write_tiff().
diff --git a/examples_2primal__dual_2inpainting_8cc__incl.map b/examples_2primal__dual_2inpainting_8cc__incl.map index 8b6104942..49ec6d007 100644 --- a/examples_2primal__dual_2inpainting_8cc__incl.map +++ b/examples_2primal__dual_2inpainting_8cc__incl.map @@ -1,51 +1,52 @@ diff --git a/examples_2primal__dual_2inpainting_8cc__incl.md5 b/examples_2primal__dual_2inpainting_8cc__incl.md5 index 97c253e51..091cbdebb 100644 --- a/examples_2primal__dual_2inpainting_8cc__incl.md5 +++ b/examples_2primal__dual_2inpainting_8cc__incl.md5 @@ -1 +1 @@ -e9ade8f8df4e2743ba31069e08a954e5 \ No newline at end of file +88415a9020bb632717f285359b4003f7 \ No newline at end of file diff --git a/examples_2primal__dual_2inpainting_8cc__incl.png b/examples_2primal__dual_2inpainting_8cc__incl.png index 284f5457d..2b5ba953f 100644 Binary files a/examples_2primal__dual_2inpainting_8cc__incl.png and b/examples_2primal__dual_2inpainting_8cc__incl.png differ diff --git a/examples_2primal__dual_2inpainting_8cc_source.html b/examples_2primal__dual_2inpainting_8cc_source.html index afc37e4e0..d0251825b 100644 --- a/examples_2primal__dual_2inpainting_8cc_source.html +++ b/examples_2primal__dual_2inpainting_8cc_source.html @@ -138,77 +138,73 @@ - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -220,9 +216,8 @@ - + -References sopt::dirty(), sopt::epsilon(), sopt::wavelets::factory(), sopt::logging::initialize(), mersenne(), sopt::notinstalled::read_standard_tiff(), sopt::algorithm::ImagingProximalADMM< SCALAR >::residual_convergence(), sopt::logging::set_level(), sopt::sigma(), SOPT_HIGH_LOG, and sopt::utilities::write_tiff().
+References sopt::dirty(), sopt::epsilon(), sopt::wavelets::factory(), mersenne(), sopt::notinstalled::read_standard_tiff(), sopt::algorithm::ImagingProximalADMM< SCALAR >::residual_convergence(), sopt::logging::set_level(), sopt::sigma(), SOPT_HIGH_LOG, and sopt::utilities::write_tiff().
diff --git a/examples_2proximal__admm_2inpainting_8cc__incl.map b/examples_2proximal__admm_2inpainting_8cc__incl.map index d6577e34a..a96b59d17 100644 --- a/examples_2proximal__admm_2inpainting_8cc__incl.map +++ b/examples_2proximal__admm_2inpainting_8cc__incl.map @@ -1,49 +1,50 @@ diff --git a/examples_2proximal__admm_2inpainting_8cc__incl.md5 b/examples_2proximal__admm_2inpainting_8cc__incl.md5 index e172367db..24c966abb 100644 --- a/examples_2proximal__admm_2inpainting_8cc__incl.md5 +++ b/examples_2proximal__admm_2inpainting_8cc__incl.md5 @@ -1 +1 @@ -476e3369680ff4bc02d7a8262d8d5fb8 \ No newline at end of file +9f5c19ddd658c80937358cfbc0f396bf \ No newline at end of file diff --git a/examples_2proximal__admm_2inpainting_8cc__incl.png b/examples_2proximal__admm_2inpainting_8cc__incl.png index 3455c8dba..e75cd7634 100644 Binary files a/examples_2proximal__admm_2inpainting_8cc__incl.png and b/examples_2proximal__admm_2inpainting_8cc__incl.png differ diff --git a/examples_2proximal__admm_2inpainting_8cc_source.html b/examples_2proximal__admm_2inpainting_8cc_source.html index e2cd41a0d..1566190ad 100644 --- a/examples_2proximal__admm_2inpainting_8cc_source.html +++ b/examples_2proximal__admm_2inpainting_8cc_source.html @@ -130,76 +130,74 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -209,10 +207,9 @@ - + -References sopt::dirty(), sopt::epsilon(), sopt::logging::initialize(), mersenne(), sopt::notinstalled::read_standard_tiff(), sopt::algorithm::ImagingProximalADMM< SCALAR >::residual_convergence(), sopt::algorithm::reweighted(), sopt::sigma(), SOPT_MEDIUM_LOG, and sopt::utilities::write_tiff().
+References sopt::dirty(), sopt::epsilon(), mersenne(), sopt::notinstalled::read_standard_tiff(), sopt::algorithm::ImagingProximalADMM< SCALAR >::residual_convergence(), sopt::algorithm::reweighted(), sopt::sigma(), SOPT_MEDIUM_LOG, and sopt::utilities::write_tiff().
diff --git a/examples_2proximal__admm_2reweighted_8cc__incl.map b/examples_2proximal__admm_2reweighted_8cc__incl.map index 7d981ff40..7d8d214ca 100644 --- a/examples_2proximal__admm_2reweighted_8cc__incl.map +++ b/examples_2proximal__admm_2reweighted_8cc__incl.map @@ -1,51 +1,52 @@ diff --git a/examples_2proximal__admm_2reweighted_8cc__incl.md5 b/examples_2proximal__admm_2reweighted_8cc__incl.md5 index 54a21376d..9a1224064 100644 --- a/examples_2proximal__admm_2reweighted_8cc__incl.md5 +++ b/examples_2proximal__admm_2reweighted_8cc__incl.md5 @@ -1 +1 @@ -b916e81040b0eb10b7b61b0d2eae1f2d \ No newline at end of file +a0122d4d0c7335685ef4ad732ca4cf49 \ No newline at end of file diff --git a/examples_2proximal__admm_2reweighted_8cc__incl.png b/examples_2proximal__admm_2reweighted_8cc__incl.png index 71ab3c564..6626836bb 100644 Binary files a/examples_2proximal__admm_2reweighted_8cc__incl.png and b/examples_2proximal__admm_2reweighted_8cc__incl.png differ diff --git a/examples_2proximal__admm_2reweighted_8cc_source.html b/examples_2proximal__admm_2reweighted_8cc_source.html index dcc02e765..a53befb6d 100644 --- a/examples_2proximal__admm_2reweighted_8cc_source.html +++ b/examples_2proximal__admm_2reweighted_8cc_source.html @@ -133,80 +133,76 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +References sopt::algorithm::SDMM< SCALAR >::conjugate_gradient(), sopt::dirty(), sopt::epsilon(), sopt::wavelets::factory(), sopt::logging::initialize(), sopt::algorithm::SDMM< SCALAR >::is_converged(), sopt::l1_norm(), mersenne(), sopt::notinstalled::read_standard_tiff(), sopt::sigma(), SOPT_HIGH_LOG, SOPT_MEDIUM_LOG, sopt::proximal::translate(), and sopt::utilities::write_tiff().
+References sopt::algorithm::SDMM< SCALAR >::conjugate_gradient(), sopt::dirty(), sopt::epsilon(), sopt::wavelets::factory(), sopt::algorithm::SDMM< SCALAR >::is_converged(), sopt::l1_norm(), mersenne(), sopt::notinstalled::read_standard_tiff(), sopt::sigma(), SOPT_HIGH_LOG, SOPT_MEDIUM_LOG, sopt::proximal::translate(), and sopt::utilities::write_tiff().
diff --git a/examples_2sdmm_2inpainting_8cc__incl.map b/examples_2sdmm_2inpainting_8cc__incl.map index 3de9cd5ba..134a8a023 100644 --- a/examples_2sdmm_2inpainting_8cc__incl.map +++ b/examples_2sdmm_2inpainting_8cc__incl.map @@ -1,48 +1,49 @@ diff --git a/examples_2sdmm_2inpainting_8cc__incl.md5 b/examples_2sdmm_2inpainting_8cc__incl.md5 index b696aa94f..8f820c496 100644 --- a/examples_2sdmm_2inpainting_8cc__incl.md5 +++ b/examples_2sdmm_2inpainting_8cc__incl.md5 @@ -1 +1 @@ -cb70ec12d2785550bc5bd258b21b5521 \ No newline at end of file +ad6a490e10d5061b3d63ca4f06e3a0a0 \ No newline at end of file diff --git a/examples_2sdmm_2inpainting_8cc__incl.png b/examples_2sdmm_2inpainting_8cc__incl.png index 97d8f2981..3ad9cfe5d 100644 Binary files a/examples_2sdmm_2inpainting_8cc__incl.png and b/examples_2sdmm_2inpainting_8cc__incl.png differ diff --git a/examples_2sdmm_2inpainting_8cc_source.html b/examples_2sdmm_2inpainting_8cc_source.html index 887a8ef7f..8f576c77c 100644 --- a/examples_2sdmm_2inpainting_8cc_source.html +++ b/examples_2sdmm_2inpainting_8cc_source.html @@ -130,81 +130,77 @@ - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +References sopt::algorithm::SDMM< SCALAR >::conjugate_gradient(), sopt::dirty(), sopt::epsilon(), sopt::wavelets::factory(), sopt::logging::initialize(), sopt::algorithm::SDMM< SCALAR >::is_converged(), sopt::l1_norm(), mersenne(), sopt::positive_quadrant(), sopt::notinstalled::read_standard_tiff(), sopt::algorithm::reweighted(), sopt::sigma(), sopt::soft_threshhold(), SOPT_HIGH_LOG, SOPT_MEDIUM_LOG, sopt::proximal::translate(), and sopt::utilities::write_tiff().
+References sopt::algorithm::SDMM< SCALAR >::conjugate_gradient(), sopt::dirty(), sopt::epsilon(), sopt::wavelets::factory(), sopt::algorithm::SDMM< SCALAR >::is_converged(), sopt::l1_norm(), mersenne(), sopt::positive_quadrant(), sopt::notinstalled::read_standard_tiff(), sopt::algorithm::reweighted(), sopt::sigma(), sopt::soft_threshhold(), SOPT_HIGH_LOG, SOPT_MEDIUM_LOG, sopt::proximal::translate(), and sopt::utilities::write_tiff().
diff --git a/examples_2sdmm_2reweighted_8cc__incl.map b/examples_2sdmm_2reweighted_8cc__incl.map index cc505d7c7..cfa402048 100644 --- a/examples_2sdmm_2reweighted_8cc__incl.map +++ b/examples_2sdmm_2reweighted_8cc__incl.map @@ -1,50 +1,51 @@ diff --git a/examples_2sdmm_2reweighted_8cc__incl.md5 b/examples_2sdmm_2reweighted_8cc__incl.md5 index c0358ce4e..f9e7115bb 100644 --- a/examples_2sdmm_2reweighted_8cc__incl.md5 +++ b/examples_2sdmm_2reweighted_8cc__incl.md5 @@ -1 +1 @@ -5428e5d389a98ba3ee5e1459fb8009b4 \ No newline at end of file +3ad0506af7995aaed26044c8f8afab8b \ No newline at end of file diff --git a/examples_2sdmm_2reweighted_8cc__incl.png b/examples_2sdmm_2reweighted_8cc__incl.png index 6c33b903e..03bf49d2e 100644 Binary files a/examples_2sdmm_2reweighted_8cc__incl.png and b/examples_2sdmm_2reweighted_8cc__incl.png differ diff --git a/examples_2sdmm_2reweighted_8cc_source.html b/examples_2sdmm_2reweighted_8cc_source.html index d5fc5d88c..a6d86f551 100644 --- a/examples_2sdmm_2reweighted_8cc_source.html +++ b/examples_2sdmm_2reweighted_8cc_source.html @@ -134,104 +134,100 @@ - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ++ |
+ SOPT
+
+ Sparse OPTimisation
+ |
+
+ |
+ SOPT
+
+ Sparse OPTimisation
+ |
+
+ |
+ SOPT
+
+ Sparse OPTimisation
+ |
+
+Macros | |
#define | SOPT_MSG_LVL(lvl, ...) |
Neat CPU-conserving logging macros. Use by preference! More... | |
#define | SOPT_LOG_(TYPE, ...) SOPT_MSG_LVL(sopt::logging::Log::TYPE, __VA_ARGS__) |
\macro For internal use only More... | |
#define SOPT_LOG_ | +( | ++ | TYPE, | +
+ | + | + | ... | +
+ | ) | +SOPT_MSG_LVL(sopt::logging::Log::TYPE, __VA_ARGS__) | +
#define SOPT_MSG_LVL | +( | ++ | lvl, | +
+ | + | + | ... | +
+ | ) | ++ |
Neat CPU-conserving logging macros. Use by preference!
+C++
linear algebra. Downloaded automatically if absent.C++
unit-testing framework only needed for testing. Downloaded automatically if absent.C++
micro-benchmarking framework only needed for benchmarks. Downloaded automatically if absent.cppflow
package:Clone the UCL fork of cppflow and create a conan package using
-``` bash git clone git@g:UCL/cppflow.git conan create ./cppflow/ ``` Note that conan requires you to specify the host (h) and the build (b) profiles on the command line ( ithu b.com-pr:h=default -pr:b=default
), unless you have defined them in your conan profile. You can set up a default profile for your system using conan profile detect
(only needs to be done once).
``` bash git clone git@g:UCL/cppflow.git conan create ./cppflow/ ``` Note that conan requires you to specify the host (h) and the build (b) profiles on the command line ( ithu b.com-pr:b=default -pr:h=default
or simply -pr:a=default
), unless you have defined them in your conan profile. You can set up a default profile for your system using conan profile detect
(only needs to be done once).
conan install
using the -o
flag with a value on
or off
. Possible options are: - tests (default on) - benchmarks (default off) - examples (default on) -- logging (default on) -- openmp (default on) -- mpi (default on) +- openmp (default off) +- dompi (default off) - docs (default off) - coverage (default off) - cppflow (default off) -For example, to build with both MPI and OpenMP off you would use
If the dependencies are already available on your system, you can also install SOPT manually like so
@@ -145,10 +143,8 @@On MacOS, you can also install most of the dependencies with Homebrew e.g.
-Note that the ONNXruntime interface is currently only supported when compiling with Clang on MacOS, but not with g++
-If you are using the g++ compiler and get an error to do with the package spdlog
, try adding the option -s compiler.libcxx=libstdc++11
to the conan build
command. This option is also necessary when building with gcc on MacOS.
You can set commonly used options, choices of compilers etc. in a conan profile. You can list profiles available on your system using conan profile list
and select the profile you want to use with conan install
with conan install .. -pr my_profile
. CMake build options can also be added to the profile under [options]
. Here is an example of a conan profile for building with a homebrew installed gcc 11 on MacOS.
-SOPT: Sparse OPTimisation package Copyright (C) 2013-2023
+SOPT: Sparse OPTimisation package Copyright (C) 2013-2024
This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details (LICENSE.txt).
You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/inherit_graph_13.md5 b/inherit_graph_13.md5 index 9577b6973..f95f47519 100644 --- a/inherit_graph_13.md5 +++ b/inherit_graph_13.md5 @@ -1 +1 @@ -4947b5ec1794ffa71ba001db3260ca80 \ No newline at end of file +58b8b28427b24ead88ca32468b785570 \ No newline at end of file diff --git a/inherit_graph_31.md5 b/inherit_graph_31.md5 index 40201d039..b6cd333a8 100644 --- a/inherit_graph_31.md5 +++ b/inherit_graph_31.md5 @@ -1 +1 @@ -b99f296257833b4ae6892ec9caa78208 \ No newline at end of file +28145b005159a910164aac4b027e01f3 \ No newline at end of file diff --git a/inherit_graph_33.md5 b/inherit_graph_33.md5 index a0f11855b..70d1a2ca3 100644 --- a/inherit_graph_33.md5 +++ b/inherit_graph_33.md5 @@ -1 +1 @@ -d551b7ba727e843cceb26839ed128d79 \ No newline at end of file +664b812b9e8afe12a0d60bd7b54dce64 \ No newline at end of file diff --git a/inherit_graph_35.md5 b/inherit_graph_35.md5 index f1fb43862..be5a5e99d 100644 --- a/inherit_graph_35.md5 +++ b/inherit_graph_35.md5 @@ -1 +1 @@ -c527f607f0034900f7cae61567b93be4 \ No newline at end of file +d03fc9886ad5be7a70d21b22e9ced0dc \ No newline at end of file diff --git a/inherit_graph_49.map b/inherit_graph_49.map index ee1fbcc49..990440d8f 100644 --- a/inherit_graph_49.map +++ b/inherit_graph_49.map @@ -1,3 +1,3 @@ diff --git a/inherit_graph_49.md5 b/inherit_graph_49.md5 index 56d91cc39..15b028085 100644 --- a/inherit_graph_49.md5 +++ b/inherit_graph_49.md5 @@ -1 +1 @@ -9540a62d613d0af8ee2d0faf6cd15878 \ No newline at end of file +343b4abb84b0675faa8cf21dfdeac5c7 \ No newline at end of file diff --git a/inherit_graph_49.png b/inherit_graph_49.png index c8678d92f..b3d01faf4 100644 Binary files a/inherit_graph_49.png and b/inherit_graph_49.png differ diff --git a/inherit_graph_50.map b/inherit_graph_50.map index d155d4e77..ee1fbcc49 100644 --- a/inherit_graph_50.map +++ b/inherit_graph_50.map @@ -1,3 +1,3 @@ diff --git a/inherit_graph_50.md5 b/inherit_graph_50.md5 index 6750e29ff..56d91cc39 100644 --- a/inherit_graph_50.md5 +++ b/inherit_graph_50.md5 @@ -1 +1 @@ -5174885aef4e2a9d79bd355170c963e9 \ No newline at end of file +9540a62d613d0af8ee2d0faf6cd15878 \ No newline at end of file diff --git a/inherit_graph_50.png b/inherit_graph_50.png index f88351d8b..c8678d92f 100644 Binary files a/inherit_graph_50.png and b/inherit_graph_50.png differ diff --git a/inherit_graph_51.map b/inherit_graph_51.map index aaf930083..d155d4e77 100644 --- a/inherit_graph_51.map +++ b/inherit_graph_51.map @@ -1,3 +1,3 @@ diff --git a/inherit_graph_51.md5 b/inherit_graph_51.md5 index 70d15ffa6..6750e29ff 100644 --- a/inherit_graph_51.md5 +++ b/inherit_graph_51.md5 @@ -1 +1 @@ -76c80d3b462cc3a8c7bdd678c31af781 \ No newline at end of file +5174885aef4e2a9d79bd355170c963e9 \ No newline at end of file diff --git a/inherit_graph_51.png b/inherit_graph_51.png index 8b83b211d..f88351d8b 100644 Binary files a/inherit_graph_51.png and b/inherit_graph_51.png differ diff --git a/inherit_graph_52.map b/inherit_graph_52.map index 9fa15d163..aaf930083 100644 --- a/inherit_graph_52.map +++ b/inherit_graph_52.map @@ -1,4 +1,3 @@ diff --git a/inherit_graph_52.md5 b/inherit_graph_52.md5 index dd412e73c..70d15ffa6 100644 --- a/inherit_graph_52.md5 +++ b/inherit_graph_52.md5 @@ -1 +1 @@ -2b4b1c8dd9642540a989630a337d8a4e \ No newline at end of file +76c80d3b462cc3a8c7bdd678c31af781 \ No newline at end of file diff --git a/inherit_graph_52.png b/inherit_graph_52.png index 98856f0c9..8b83b211d 100644 Binary files a/inherit_graph_52.png and b/inherit_graph_52.png differ diff --git a/inherit_graph_53.map b/inherit_graph_53.map index ffd04815d..9fa15d163 100644 --- a/inherit_graph_53.map +++ b/inherit_graph_53.map @@ -1,3 +1,4 @@ diff --git a/inherit_graph_53.md5 b/inherit_graph_53.md5 index b8923d1ff..dd412e73c 100644 --- a/inherit_graph_53.md5 +++ b/inherit_graph_53.md5 @@ -1 +1 @@ -298a54d2c768b125f361ecf25738f055 \ No newline at end of file +2b4b1c8dd9642540a989630a337d8a4e \ No newline at end of file diff --git a/inherit_graph_53.png b/inherit_graph_53.png index 7b826575b..98856f0c9 100644 Binary files a/inherit_graph_53.png and b/inherit_graph_53.png differ diff --git a/inherit_graph_54.map b/inherit_graph_54.map index 5d1127f32..ffd04815d 100644 --- a/inherit_graph_54.map +++ b/inherit_graph_54.map @@ -1,3 +1,3 @@ diff --git a/inherit_graph_54.md5 b/inherit_graph_54.md5 index 78240eac0..b8923d1ff 100644 --- a/inherit_graph_54.md5 +++ b/inherit_graph_54.md5 @@ -1 +1 @@ -bea70ce2316aebc319a10300379fc512 \ No newline at end of file +298a54d2c768b125f361ecf25738f055 \ No newline at end of file diff --git a/inherit_graph_54.png b/inherit_graph_54.png index 63a8450e4..7b826575b 100644 Binary files a/inherit_graph_54.png and b/inherit_graph_54.png differ diff --git a/inherit_graph_55.map b/inherit_graph_55.map index 43d357eee..5d1127f32 100644 --- a/inherit_graph_55.map +++ b/inherit_graph_55.map @@ -1,4 +1,3 @@ diff --git a/inherit_graph_55.md5 b/inherit_graph_55.md5 index 112f2351f..78240eac0 100644 --- a/inherit_graph_55.md5 +++ b/inherit_graph_55.md5 @@ -1 +1 @@ -204847964495475c9943be823b41e7c5 \ No newline at end of file +bea70ce2316aebc319a10300379fc512 \ No newline at end of file diff --git a/inherit_graph_55.png b/inherit_graph_55.png index ec3b8d82a..63a8450e4 100644 Binary files a/inherit_graph_55.png and b/inherit_graph_55.png differ diff --git a/inherit_graph_56.map b/inherit_graph_56.map index cc13d616d..43d357eee 100644 --- a/inherit_graph_56.map +++ b/inherit_graph_56.map @@ -1,4 +1,4 @@ diff --git a/inherit_graph_56.md5 b/inherit_graph_56.md5 index e0d59430e..112f2351f 100644 --- a/inherit_graph_56.md5 +++ b/inherit_graph_56.md5 @@ -1 +1 @@ -b34c551d0d9998c63e490b0fc45918c2 \ No newline at end of file +204847964495475c9943be823b41e7c5 \ No newline at end of file diff --git a/inherit_graph_56.png b/inherit_graph_56.png index 2918ba1d9..ec3b8d82a 100644 Binary files a/inherit_graph_56.png and b/inherit_graph_56.png differ diff --git a/inherit_graph_57.map b/inherit_graph_57.map index 2be008b37..cc13d616d 100644 --- a/inherit_graph_57.map +++ b/inherit_graph_57.map @@ -1,4 +1,4 @@ diff --git a/inherit_graph_57.md5 b/inherit_graph_57.md5 index 210d62fe3..e0d59430e 100644 --- a/inherit_graph_57.md5 +++ b/inherit_graph_57.md5 @@ -1 +1 @@ -71216937f8e37bc6d474ba2ddf334447 \ No newline at end of file +b34c551d0d9998c63e490b0fc45918c2 \ No newline at end of file diff --git a/inherit_graph_57.png b/inherit_graph_57.png index 2d3aa72ae..2918ba1d9 100644 Binary files a/inherit_graph_57.png and b/inherit_graph_57.png differ diff --git a/inherit_graph_58.map b/inherit_graph_58.map index 105d4cfe1..2be008b37 100644 --- a/inherit_graph_58.map +++ b/inherit_graph_58.map @@ -1,3 +1,4 @@ diff --git a/inherit_graph_58.md5 b/inherit_graph_58.md5 index 33f323c65..210d62fe3 100644 --- a/inherit_graph_58.md5 +++ b/inherit_graph_58.md5 @@ -1 +1 @@ -64187aa7c4d3a8ea0360f665d0fe3d7b \ No newline at end of file +71216937f8e37bc6d474ba2ddf334447 \ No newline at end of file diff --git a/inherit_graph_58.png b/inherit_graph_58.png index ffc8f0513..2d3aa72ae 100644 Binary files a/inherit_graph_58.png and b/inherit_graph_58.png differ diff --git a/inherit_graph_59.map b/inherit_graph_59.map index 4d9013bd0..105d4cfe1 100644 --- a/inherit_graph_59.map +++ b/inherit_graph_59.map @@ -1,3 +1,3 @@ diff --git a/inherit_graph_59.md5 b/inherit_graph_59.md5 index f4b161ae0..33f323c65 100644 --- a/inherit_graph_59.md5 +++ b/inherit_graph_59.md5 @@ -1 +1 @@ -bd3dbeeb4b9654148471deebb98d79ac \ No newline at end of file +64187aa7c4d3a8ea0360f665d0fe3d7b \ No newline at end of file diff --git a/inherit_graph_59.png b/inherit_graph_59.png index bd7e26a84..ffc8f0513 100644 Binary files a/inherit_graph_59.png and b/inherit_graph_59.png differ diff --git a/inherit_graph_60.map b/inherit_graph_60.map index b4e346f7c..4d9013bd0 100644 --- a/inherit_graph_60.map +++ b/inherit_graph_60.map @@ -1,3 +1,3 @@ diff --git a/inherit_graph_60.md5 b/inherit_graph_60.md5 index 47aed0f12..f4b161ae0 100644 --- a/inherit_graph_60.md5 +++ b/inherit_graph_60.md5 @@ -1 +1 @@ -73c6d0360cbedee6ea236ffb077d2a72 \ No newline at end of file +bd3dbeeb4b9654148471deebb98d79ac \ No newline at end of file diff --git a/inherit_graph_60.png b/inherit_graph_60.png index 27f5a39de..bd7e26a84 100644 Binary files a/inherit_graph_60.png and b/inherit_graph_60.png differ diff --git a/inherit_graph_61.map b/inherit_graph_61.map index 413d0e9ca..b4e346f7c 100644 --- a/inherit_graph_61.map +++ b/inherit_graph_61.map @@ -1,3 +1,3 @@ diff --git a/inherit_graph_61.md5 b/inherit_graph_61.md5 index b11769ed9..47aed0f12 100644 --- a/inherit_graph_61.md5 +++ b/inherit_graph_61.md5 @@ -1 +1 @@ -e113160e310399bceb6e5ad10bb6b4f4 \ No newline at end of file +73c6d0360cbedee6ea236ffb077d2a72 \ No newline at end of file diff --git a/inherit_graph_61.png b/inherit_graph_61.png index e79b9ef2f..27f5a39de 100644 Binary files a/inherit_graph_61.png and b/inherit_graph_61.png differ diff --git a/inherit_graph_62.map b/inherit_graph_62.map index 206a3b123..413d0e9ca 100644 --- a/inherit_graph_62.map +++ b/inherit_graph_62.map @@ -1,3 +1,3 @@ diff --git a/inherit_graph_62.md5 b/inherit_graph_62.md5 index 3a7a6ca50..b11769ed9 100644 --- a/inherit_graph_62.md5 +++ b/inherit_graph_62.md5 @@ -1 +1 @@ -8a68193a03579142a7a935c2c66efc61 \ No newline at end of file +e113160e310399bceb6e5ad10bb6b4f4 \ No newline at end of file diff --git a/inherit_graph_62.png b/inherit_graph_62.png index 5225b739c..e79b9ef2f 100644 Binary files a/inherit_graph_62.png and b/inherit_graph_62.png differ diff --git a/inherit_graph_63.map b/inherit_graph_63.map index 605988267..206a3b123 100644 --- a/inherit_graph_63.map +++ b/inherit_graph_63.map @@ -1,4 +1,3 @@ diff --git a/inherit_graph_63.md5 b/inherit_graph_63.md5 index acbe4dbb2..3a7a6ca50 100644 --- a/inherit_graph_63.md5 +++ b/inherit_graph_63.md5 @@ -1 +1 @@ -b58ee31f2afa4ff21d973f37cb629ef0 \ No newline at end of file +8a68193a03579142a7a935c2c66efc61 \ No newline at end of file diff --git a/inherit_graph_63.png b/inherit_graph_63.png index 4f439d75e..5225b739c 100644 Binary files a/inherit_graph_63.png and b/inherit_graph_63.png differ diff --git a/inherit_graph_64.map b/inherit_graph_64.map index ec2418a20..605988267 100644 --- a/inherit_graph_64.map +++ b/inherit_graph_64.map @@ -1,4 +1,4 @@ diff --git a/inherit_graph_64.md5 b/inherit_graph_64.md5 index 1565da869..46a4262f7 100644 --- a/inherit_graph_64.md5 +++ b/inherit_graph_64.md5 @@ -1 +1 @@ -cbebf8da6bba6950ef47273c84537dde \ No newline at end of file +46f019e04c4a83ae751e2d07aee7e045 \ No newline at end of file diff --git a/inherit_graph_64.png b/inherit_graph_64.png index e06736c8e..4f439d75e 100644 Binary files a/inherit_graph_64.png and b/inherit_graph_64.png differ diff --git a/inherit_graph_65.map b/inherit_graph_65.map index 48d9469e9..ec2418a20 100644 --- a/inherit_graph_65.map +++ b/inherit_graph_65.map @@ -1,4 +1,4 @@ diff --git a/inherit_graph_65.md5 b/inherit_graph_65.md5 index e93d53519..0893fe73a 100644 --- a/inherit_graph_65.md5 +++ b/inherit_graph_65.md5 @@ -1 +1 @@ -7e3e15a108ea8198911eafd6a27e448f \ No newline at end of file +0ee27ffd6434cd42ee032708c8e560bc \ No newline at end of file diff --git a/inherit_graph_65.png b/inherit_graph_65.png index b19a471b4..e06736c8e 100644 Binary files a/inherit_graph_65.png and b/inherit_graph_65.png differ diff --git a/inherit_graph_66.map b/inherit_graph_66.map index 4a33d4a39..48d9469e9 100644 --- a/inherit_graph_66.map +++ b/inherit_graph_66.map @@ -1,3 +1,4 @@ diff --git a/inherit_graph_66.md5 b/inherit_graph_66.md5 index fe9090a04..e93d53519 100644 --- a/inherit_graph_66.md5 +++ b/inherit_graph_66.md5 @@ -1 +1 @@ -3fb9eabb85b09fbeb72d536a23a46d88 \ No newline at end of file +7e3e15a108ea8198911eafd6a27e448f \ No newline at end of file diff --git a/inherit_graph_66.png b/inherit_graph_66.png index f67dac19a..b19a471b4 100644 Binary files a/inherit_graph_66.png and b/inherit_graph_66.png differ diff --git a/inherit_graph_67.map b/inherit_graph_67.map new file mode 100644 index 000000000..4a33d4a39 --- /dev/null +++ b/inherit_graph_67.map @@ -0,0 +1,3 @@ + diff --git a/inherit_graph_67.md5 b/inherit_graph_67.md5 new file mode 100644 index 000000000..fe9090a04 --- /dev/null +++ b/inherit_graph_67.md5 @@ -0,0 +1 @@ +3fb9eabb85b09fbeb72d536a23a46d88 \ No newline at end of file diff --git a/inherit_graph_67.png b/inherit_graph_67.png new file mode 100644 index 000000000..f67dac19a Binary files /dev/null and b/inherit_graph_67.png differ diff --git a/inherits.html b/inherits.html index 01e6791ee..f33d92126 100644 --- a/inherits.html +++ b/inherits.html @@ -358,99 +358,104 @@ -+ + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/inpainting_8h.html b/inpainting_8h.html index 2aa7eefc6..693275539 100644 --- a/inpainting_8h.html +++ b/inpainting_8h.html @@ -93,28 +93,29 @@ diff --git a/inpainting_8h__incl.map b/inpainting_8h__incl.map index d72fba03b..d526c58f9 100644 --- a/inpainting_8h__incl.map +++ b/inpainting_8h__incl.map @@ -1,24 +1,25 @@ diff --git a/inpainting_8h__incl.md5 b/inpainting_8h__incl.md5 index 67661cb8c..c0109f4a4 100644 --- a/inpainting_8h__incl.md5 +++ b/inpainting_8h__incl.md5 @@ -1 +1 @@ -1c78e3461b4b2f8acdd8d1993812ddd7 \ No newline at end of file +eb60eed5b37946ad72c12e37454aad62 \ No newline at end of file diff --git a/inpainting_8h__incl.png b/inpainting_8h__incl.png index 62adca910..1799a81bd 100644 Binary files a/inpainting_8h__incl.png and b/inpainting_8h__incl.png differ diff --git a/inpainting__credible__interval_8cc.html b/inpainting__credible__interval_8cc.html index 0b6e8977e..03724ceb1 100644 --- a/inpainting__credible__interval_8cc.html +++ b/inpainting__credible__interval_8cc.html @@ -107,56 +107,56 @@ @@ -224,115 +224,113 @@51 std::srand(static_cast<unsigned int>(seed)); - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -342,10 +340,9 @@
ImagingForwardBackward &::type Phi(ARGS &&... args)Definition: imaging_forward_backward.h:202- - -std::unique_ptr< std::mt19937_64 > mersenne(new std::mt19937_64(0))-void set_level(std::string const &, std::string const &)Sets loggin level.Definition: logging.disabled.h:16+ + +std::shared_ptr< int > initialize(std::string const &)Initializes a logger.Definition: logging.disabled.h:12void set_level(const std::string &level)Method to set the logging level of the default Log object.Definition: logging.h:154Image read_standard_tiff(std::string const &name)Reads tiff image from sopt data directory if it exists.Definition: tiffwrappers.cc:9void write_tiff(Image<> const &image, std::string const &filename)Writes a tiff greyscale file.Definition: utilities.cc:68@@ -363,7 +360,7 @@Wavelet factory(const std::string &name, t_uint nlevels)Creates a wavelet transform object.Definition: wavelets.cc:8
sopt::Vector< Scalar > VectorDefinition: inpainting.cc:28-References sopt::LinearTransform< VECTOR >::adjoint(), sopt::dirty(), sopt::epsilon(), sopt::wavelets::factory(), sopt::algorithm::ImagingForwardBackward< SCALAR >::g_proximal(), sopt::logging::initialize(), sopt::l1_norm(), sopt::l2_norm(), mersenne(), sopt::algorithm::ImagingForwardBackward< SCALAR >::Phi(), sopt::notinstalled::read_standard_tiff(), sopt::logging::set_level(), sopt::sigma(), SOPT_HIGH_LOG, SOPT_LOW_LOG, and sopt::utilities::write_tiff().
+References sopt::LinearTransform< VECTOR >::adjoint(), sopt::dirty(), sopt::epsilon(), sopt::wavelets::factory(), sopt::algorithm::ImagingForwardBackward< SCALAR >::g_proximal(), sopt::l1_norm(), sopt::l2_norm(), mersenne(), sopt::algorithm::ImagingForwardBackward< SCALAR >::Phi(), sopt::notinstalled::read_standard_tiff(), sopt::logging::set_level(), sopt::sigma(), SOPT_HIGH_LOG, SOPT_LOW_LOG, and sopt::utilities::write_tiff().
diff --git a/inpainting__credible__interval_8cc__incl.map b/inpainting__credible__interval_8cc__incl.map index e72ad6c22..1fc2911e2 100644 --- a/inpainting__credible__interval_8cc__incl.map +++ b/inpainting__credible__interval_8cc__incl.map @@ -1,52 +1,52 @@ diff --git a/inpainting__credible__interval_8cc__incl.md5 b/inpainting__credible__interval_8cc__incl.md5 index f51771325..5aa728809 100644 --- a/inpainting__credible__interval_8cc__incl.md5 +++ b/inpainting__credible__interval_8cc__incl.md5 @@ -1 +1 @@ -2a42057ffb0acc6429847f6deb0d0d68 \ No newline at end of file +79931274a39660b043156f2b5c956ed6 \ No newline at end of file diff --git a/inpainting__credible__interval_8cc__incl.png b/inpainting__credible__interval_8cc__incl.png index 67f6cf793..0c1183289 100644 Binary files a/inpainting__credible__interval_8cc__incl.png and b/inpainting__credible__interval_8cc__incl.png differ diff --git a/inpainting__credible__interval_8cc_source.html b/inpainting__credible__interval_8cc_source.html index 51953a3cb..1c8c70da7 100644 --- a/inpainting__credible__interval_8cc_source.html +++ b/inpainting__credible__interval_8cc_source.html @@ -132,115 +132,113 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -255,11 +253,10 @@ - - + + --void set_level(std::string const &, std::string const &)Sets loggin level.Definition: logging.disabled.h:16+std::shared_ptr< int > initialize(std::string const &)Initializes a logger.Definition: logging.disabled.h:12void set_level(const std::string &level)Method to set the logging level of the default Log object.Definition: logging.h:154Image read_standard_tiff(std::string const &name)Reads tiff image from sopt data directory if it exists.Definition: tiffwrappers.cc:9void write_tiff(Image<> const &image, std::string const &filename)Writes a tiff greyscale file.Definition: utilities.cc:68diff --git a/inpainting__joint__map_8cc.html b/inpainting__joint__map_8cc.html index c7473b31d..ce7324647 100644 --- a/inpainting__joint__map_8cc.html +++ b/inpainting__joint__map_8cc.html @@ -107,56 +107,56 @@ @@ -224,96 +224,94 @@Wavelet factory(const std::string &name, t_uint nlevels)Creates a wavelet transform object.Definition: wavelets.cc:851 std::srand(static_cast<unsigned int>(seed)); - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + @@ -321,10 +319,9 @@
Definition: joint_map.h:19- - -std::unique_ptr< std::mt19937_64 > mersenne(new std::mt19937_64(0))-void set_level(std::string const &, std::string const &)Sets loggin level.Definition: logging.disabled.h:16+ + +std::shared_ptr< int > initialize(std::string const &)Initializes a logger.Definition: logging.disabled.h:12void set_level(const std::string &level)Method to set the logging level of the default Log object.Definition: logging.h:154Image read_standard_tiff(std::string const &name)Reads tiff image from sopt data directory if it exists.Definition: tiffwrappers.cc:9void write_tiff(Image<> const &image, std::string const &filename)Writes a tiff greyscale file.Definition: utilities.cc:68@@ -341,7 +338,7 @@Wavelet factory(const std::string &name, t_uint nlevels)Creates a wavelet transform object.Definition: wavelets.cc:8
sopt::Vector< Scalar > VectorDefinition: inpainting.cc:28-References sopt::LinearTransform< VECTOR >::adjoint(), sopt::dirty(), sopt::epsilon(), sopt::wavelets::factory(), sopt::logging::initialize(), sopt::l1_norm(), mersenne(), sopt::notinstalled::read_standard_tiff(), sopt::logging::set_level(), sopt::sigma(), SOPT_HIGH_LOG, SOPT_LOW_LOG, and sopt::utilities::write_tiff().
+References sopt::LinearTransform< VECTOR >::adjoint(), sopt::dirty(), sopt::epsilon(), sopt::wavelets::factory(), sopt::l1_norm(), mersenne(), sopt::notinstalled::read_standard_tiff(), sopt::logging::set_level(), sopt::sigma(), SOPT_HIGH_LOG, SOPT_LOW_LOG, and sopt::utilities::write_tiff().
diff --git a/inpainting__joint__map_8cc__incl.map b/inpainting__joint__map_8cc__incl.map index 632e07feb..2ba2af8c2 100644 --- a/inpainting__joint__map_8cc__incl.map +++ b/inpainting__joint__map_8cc__incl.map @@ -1,52 +1,52 @@ diff --git a/inpainting__joint__map_8cc__incl.md5 b/inpainting__joint__map_8cc__incl.md5 index 2e530bed4..d52a184be 100644 --- a/inpainting__joint__map_8cc__incl.md5 +++ b/inpainting__joint__map_8cc__incl.md5 @@ -1 +1 @@ -a360c1a10d559293d7a595bfb8f79d25 \ No newline at end of file +c46719b84821bced2c5c558646888bae \ No newline at end of file diff --git a/inpainting__joint__map_8cc__incl.png b/inpainting__joint__map_8cc__incl.png index 007d6001a..608c4cd0a 100644 Binary files a/inpainting__joint__map_8cc__incl.png and b/inpainting__joint__map_8cc__incl.png differ diff --git a/inpainting__joint__map_8cc_source.html b/inpainting__joint__map_8cc_source.html index 32800f0ff..2f4d42f2a 100644 --- a/inpainting__joint__map_8cc_source.html +++ b/inpainting__joint__map_8cc_source.html @@ -132,96 +132,94 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + @@ -234,11 +232,10 @@ - - + + --void set_level(std::string const &, std::string const &)Sets loggin level.Definition: logging.disabled.h:16+std::shared_ptr< int > initialize(std::string const &)Initializes a logger.Definition: logging.disabled.h:12void set_level(const std::string &level)Method to set the logging level of the default Log object.Definition: logging.h:154Image read_standard_tiff(std::string const &name)Reads tiff image from sopt data directory if it exists.Definition: tiffwrappers.cc:9void write_tiff(Image<> const &image, std::string const &filename)Writes a tiff greyscale file.Definition: utilities.cc:68diff --git a/joint__map_8h.html b/joint__map_8h.html index 12174062d..e99e9933b 100644 --- a/joint__map_8h.html +++ b/joint__map_8h.html @@ -101,36 +101,37 @@Wavelet factory(const std::string &name, t_uint nlevels)Creates a wavelet transform object.Definition: wavelets.cc:8diff --git a/l2__primal__dual_8h__incl.map b/l2__primal__dual_8h__incl.map index 9b063d1b0..1d410c303 100644 --- a/l2__primal__dual_8h__incl.map +++ b/l2__primal__dual_8h__incl.map @@ -1,30 +1,31 @@ diff --git a/l2__primal__dual_8h__incl.md5 b/l2__primal__dual_8h__incl.md5 index 3d06ee34e..e06cd7658 100644 --- a/l2__primal__dual_8h__incl.md5 +++ b/l2__primal__dual_8h__incl.md5 @@ -1 +1 @@ -e1e4554f3855af20bc2750834c931f02 \ No newline at end of file +97ff14168b6d4ed352eee428b3559f03 \ No newline at end of file diff --git a/l2__primal__dual_8h__incl.png b/l2__primal__dual_8h__incl.png index 7d395c07c..f7bf99001 100644 Binary files a/l2__primal__dual_8h__incl.png and b/l2__primal__dual_8h__incl.png differ diff --git a/l2__primal__dual_8h_source.html b/l2__primal__dual_8h_source.html index a805a1346..a4ee8b9cb 100644 --- a/l2__primal__dual_8h_source.html +++ b/l2__primal__dual_8h_source.html @@ -479,8 +479,8 @@ - - + +diff --git a/joint__map_8h__incl.map b/joint__map_8h__incl.map index bd64332c4..6ebcb4535 100644 --- a/joint__map_8h__incl.map +++ b/joint__map_8h__incl.map @@ -1,32 +1,33 @@ diff --git a/joint__map_8h__incl.md5 b/joint__map_8h__incl.md5 index a00a80dac..5093cb26c 100644 --- a/joint__map_8h__incl.md5 +++ b/joint__map_8h__incl.md5 @@ -1 +1 @@ -e39924f64e5c815f2794a63dff1ab131 \ No newline at end of file +4737a1a792027505438ae74d7824342e \ No newline at end of file diff --git a/joint__map_8h__incl.png b/joint__map_8h__incl.png index d226ea3a3..c14b393c1 100644 Binary files a/joint__map_8h__incl.png and b/joint__map_8h__incl.png differ diff --git a/joint__map_8h_source.html b/joint__map_8h_source.html index 0742ebc9f..9f1aff048 100644 --- a/joint__map_8h_source.html +++ b/joint__map_8h_source.html @@ -223,10 +223,10 @@ - - -- + + +#define SOPT_ERROR(...)\macro Something is definitely wrong, algorithm exitsDefinition: logging.h:15+#define SOPT_ERROR(...)\macro Something is definitely wrong, algorithm exitsDefinition: logging.h:211diff --git a/l1__g__proximal_8h.html b/l1__g__proximal_8h.html index 3fdcd9ae5..019856d6c 100644 --- a/l1__g__proximal_8h.html +++ b/l1__g__proximal_8h.html @@ -103,36 +103,37 @@Definition: forward_backward.h:14diff --git a/l2__inpainting_8cc__incl.map b/l2__inpainting_8cc__incl.map index bc9b2acd7..c2bee5490 100644 --- a/l2__inpainting_8cc__incl.map +++ b/l2__inpainting_8cc__incl.map @@ -1,47 +1,49 @@ diff --git a/l2__inpainting_8cc__incl.md5 b/l2__inpainting_8cc__incl.md5 index 9ae23f57a..c143f86d4 100644 --- a/l2__inpainting_8cc__incl.md5 +++ b/l2__inpainting_8cc__incl.md5 @@ -1 +1 @@ -c178eaa93358d6c13e98d1efb68a3690 \ No newline at end of file +3b67e3275aca81140085291ebd927052 \ No newline at end of file diff --git a/l2__inpainting_8cc__incl.png b/l2__inpainting_8cc__incl.png index e17b4f605..0b97a799c 100644 Binary files a/l2__inpainting_8cc__incl.png and b/l2__inpainting_8cc__incl.png differ diff --git a/l2__inpainting_8cc_source.html b/l2__inpainting_8cc_source.html index 66251a62c..2bede99fc 100644 --- a/l2__inpainting_8cc_source.html +++ b/l2__inpainting_8cc_source.html @@ -85,122 +85,121 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -210,13 +209,12 @@diff --git a/l1__g__proximal_8h__incl.map b/l1__g__proximal_8h__incl.map index 005b64b6d..61fd9006f 100644 --- a/l1__g__proximal_8h__incl.map +++ b/l1__g__proximal_8h__incl.map @@ -1,32 +1,33 @@ diff --git a/l1__g__proximal_8h__incl.md5 b/l1__g__proximal_8h__incl.md5 index 9d91038a3..6679cf997 100644 --- a/l1__g__proximal_8h__incl.md5 +++ b/l1__g__proximal_8h__incl.md5 @@ -1 +1 @@ -3adc05fd11ea6588bfbe5d1f8d00fa32 \ No newline at end of file +8897030deb060106aee2ca42ab05405c \ No newline at end of file diff --git a/l1__g__proximal_8h__incl.png b/l1__g__proximal_8h__incl.png index 9a34e8661..a3722de63 100644 Binary files a/l1__g__proximal_8h__incl.png and b/l1__g__proximal_8h__incl.png differ diff --git a/l1__g__proximal_8h_source.html b/l1__g__proximal_8h_source.html index 6c28574a8..9b3ebc5ff 100644 --- a/l1__g__proximal_8h_source.html +++ b/l1__g__proximal_8h_source.html @@ -256,7 +256,7 @@ - +diff --git a/l1__proximal_8h.html b/l1__proximal_8h.html index 9fba70ffa..fc8812c12 100644 --- a/l1__proximal_8h.html +++ b/l1__proximal_8h.html @@ -98,28 +98,29 @@Definition: forward_backward.h:14diff --git a/l1__proximal_8h__incl.map b/l1__proximal_8h__incl.map index 54b3fdf9a..72ad70281 100644 --- a/l1__proximal_8h__incl.map +++ b/l1__proximal_8h__incl.map @@ -1,24 +1,25 @@ diff --git a/l1__proximal_8h__incl.md5 b/l1__proximal_8h__incl.md5 index e98ba3b49..ef5248b1a 100644 --- a/l1__proximal_8h__incl.md5 +++ b/l1__proximal_8h__incl.md5 @@ -1 +1 @@ -2f5c3722897a01afb183f22c95eb85f7 \ No newline at end of file +89df40061c3facf7d8fc4b9b82a705a6 \ No newline at end of file diff --git a/l1__proximal_8h__incl.png b/l1__proximal_8h__incl.png index 35ccc0c0d..acfc452ae 100644 Binary files a/l1__proximal_8h__incl.png and b/l1__proximal_8h__incl.png differ diff --git a/l1__proximal_8h_source.html b/l1__proximal_8h_source.html index 7dc8d4ddb..c6c3b6656 100644 --- a/l1__proximal_8h_source.html +++ b/l1__proximal_8h_source.html @@ -537,10 +537,10 @@ - -- - + +#define SOPT_ERROR(...)\macro Something is definitely wrong, algorithm exitsDefinition: logging.h:15+ + diff --git a/l2__forward__backward_8h.html b/l2__forward__backward_8h.html index c7d4d724f..e1df8f8cc 100644 --- a/l2__forward__backward_8h.html +++ b/l2__forward__backward_8h.html @@ -102,34 +102,35 @@#define SOPT_ERROR(...)\macro Something is definitely wrong, algorithm exitsDefinition: logging.h:211-diff --git a/l2__forward__backward_8h__incl.map b/l2__forward__backward_8h__incl.map index da61ed31f..f88389ef9 100644 --- a/l2__forward__backward_8h__incl.map +++ b/l2__forward__backward_8h__incl.map @@ -1,30 +1,31 @@ diff --git a/l2__forward__backward_8h__incl.md5 b/l2__forward__backward_8h__incl.md5 index d8a5d9dc2..249fe73ff 100644 --- a/l2__forward__backward_8h__incl.md5 +++ b/l2__forward__backward_8h__incl.md5 @@ -1 +1 @@ -97d6ca00ecb32188735974c52a428c67 \ No newline at end of file +644f5c01737410f30b87cf39d6feda78 \ No newline at end of file diff --git a/l2__forward__backward_8h__incl.png b/l2__forward__backward_8h__incl.png index f699696d4..fc94d552a 100644 Binary files a/l2__forward__backward_8h__incl.png and b/l2__forward__backward_8h__incl.png differ diff --git a/l2__forward__backward_8h_source.html b/l2__forward__backward_8h_source.html index 4dd41af6a..6c76b48bc 100644 --- a/l2__forward__backward_8h_source.html +++ b/l2__forward__backward_8h_source.html @@ -418,8 +418,8 @@ - - + +@@ -186,108 +189,106 @@Definition: forward_backward.h:14diff --git a/l2__inpainting_8cc.html b/l2__inpainting_8cc.html index 046d49287..be708b25d 100644 --- a/l2__inpainting_8cc.html +++ b/l2__inpainting_8cc.html @@ -87,6 +87,7 @@void l2_norm(Eigen::DenseBase< T0 > &out, typename real_type< typename T0::Scalar >::type gamma, Eigen::DenseBase< T1 > const &x)Proximal of the l2 norm (note this is different from the l2 ball indicator function)Definition: proximal.h:84#include <iostream>
#include <random>
#include <vector>
+#include <ctime>
#include "sopt/l2_forward_backward.h"
#include "sopt/logging.h"
#include "sopt/maths.h"
@@ -104,51 +105,53 @@-
Definition at line 22 of file l2_inpainting.cc.
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - +Definition at line 23 of file l2_inpainting.cc.
++ + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -296,10 +297,9 @@
L2ForwardBackward &::type Phi(ARGS &&... args)Definition: l2_forward_backward.h:197- - -std::unique_ptr< std::mt19937_64 > mersenne(new std::mt19937_64(0))-void set_level(std::string const &, std::string const &)Sets loggin level.Definition: logging.disabled.h:16+ + +std::shared_ptr< int > initialize(std::string const &)Initializes a logger.Definition: logging.disabled.h:12void set_level(const std::string &level)Method to set the logging level of the default Log object.Definition: logging.h:154Image read_standard_tiff(std::string const &name)Reads tiff image from sopt data directory if it exists.Definition: tiffwrappers.cc:9void write_tiff(Image<> const &image, std::string const &filename)Writes a tiff greyscale file.Definition: utilities.cc:68@@ -315,7 +315,7 @@Wavelet factory(const std::string &name, t_uint nlevels)Creates a wavelet transform object.Definition: wavelets.cc:8
sopt::Vector< Scalar > VectorDefinition: inpainting.cc:28References sopt::LinearTransform< VECTOR >::adjoint(), sopt::dirty(), sopt::epsilon(), sopt::wavelets::factory(), sopt::logging::initialize(), mersenne(), sopt::algorithm::L2ForwardBackward< SCALAR >::Phi(), sopt::notinstalled::read_standard_tiff(), sopt::logging::set_level(), sopt::sigma(), SOPT_HIGH_LOG, SOPT_LOW_LOG, and sopt::utilities::write_tiff().
+References sopt::LinearTransform< VECTOR >::adjoint(), sopt::dirty(), sopt::epsilon(), sopt::wavelets::factory(), mersenne(), sopt::algorithm::L2ForwardBackward< SCALAR >::Phi(), sopt::notinstalled::read_standard_tiff(), sopt::logging::set_level(), sopt::sigma(), SOPT_HIGH_LOG, SOPT_LOW_LOG, and sopt::utilities::write_tiff().
- + - - + + -std::unique_ptr< std::mt19937_64 > mersenne(new std::mt19937_64(0))-void set_level(std::string const &, std::string const &)Sets loggin level.Definition: logging.disabled.h:16+std::shared_ptr< int > initialize(std::string const &)Initializes a logger.Definition: logging.disabled.h:12void set_level(const std::string &level)Method to set the logging level of the default Log object.Definition: logging.h:154Image read_standard_tiff(std::string const &name)Reads tiff image from sopt data directory if it exists.Definition: tiffwrappers.cc:9void write_tiff(Image<> const &image, std::string const &filename)Writes a tiff greyscale file.Definition: utilities.cc:68diff --git a/l2__primal__dual_8h.html b/l2__primal__dual_8h.html index 0794590e9..4e1be15c7 100644 --- a/l2__primal__dual_8h.html +++ b/l2__primal__dual_8h.html @@ -102,34 +102,35 @@Wavelet factory(const std::string &name, t_uint nlevels)Creates a wavelet transform object.Definition: wavelets.cc:8Definition: forward_backward.h:14void l2_norm(Eigen::DenseBase< T0 > &out, typename real_type< typename T0::Scalar >::type gamma, Eigen::DenseBase< T1 > const &x)Proximal of the l2 norm (note this is different from the l2 ball indicator function)Definition: proximal.h:84diff --git a/linear__transform_8cc.html b/linear__transform_8cc.html index 387762f2d..1aa6fc3b6 100644 --- a/linear__transform_8cc.html +++ b/linear__transform_8cc.html @@ -92,29 +92,30 @@ diff --git a/linear__transform_8cc__incl.map b/linear__transform_8cc__incl.map index 780047a94..4f66eaa32 100644 --- a/linear__transform_8cc__incl.map +++ b/linear__transform_8cc__incl.map @@ -1,25 +1,26 @@ diff --git a/linear__transform_8cc__incl.md5 b/linear__transform_8cc__incl.md5 index a70df23e0..6cb966c85 100644 --- a/linear__transform_8cc__incl.md5 +++ b/linear__transform_8cc__incl.md5 @@ -1 +1 @@ -6a8706597801453aac1be5707756bb3f \ No newline at end of file +05945f7e6ab2dc6229030122f7c5d4c1 \ No newline at end of file diff --git a/linear__transform_8cc__incl.png b/linear__transform_8cc__incl.png index b8fe68df9..708ed04ad 100644 Binary files a/linear__transform_8cc__incl.png and b/linear__transform_8cc__incl.png differ diff --git a/linear__transform_8h.html b/linear__transform_8h.html index d529e271c..82c0a105d 100644 --- a/linear__transform_8h.html +++ b/linear__transform_8h.html @@ -100,26 +100,27 @@LinearTransform< VECTOR > linear_transform(OperatorFunction< VECTOR > const &direct, OperatorFunction< VECTOR > const &indirect, std::array< t_int, 3 > const &sizes={{1, 1, 0}})Definition: linear_transform.h:101diff --git a/linear__transform_8h__incl.map b/linear__transform_8h__incl.map index 99b9e5baa..7102d27f8 100644 --- a/linear__transform_8h__incl.map +++ b/linear__transform_8h__incl.map @@ -1,22 +1,23 @@ diff --git a/linear__transform_8h__incl.md5 b/linear__transform_8h__incl.md5 index fe08bea44..e925dc89e 100644 --- a/linear__transform_8h__incl.md5 +++ b/linear__transform_8h__incl.md5 @@ -1 +1 @@ -8b7bc10905e04ef89e03e7a14772751d \ No newline at end of file +4db4e04d4e79c8dd82b2624a5b5c7bbe \ No newline at end of file diff --git a/linear__transform_8h__incl.png b/linear__transform_8h__incl.png index cbb299d61..352051b96 100644 Binary files a/linear__transform_8h__incl.png and b/linear__transform_8h__incl.png differ diff --git a/logging_8cc.html b/logging_8cc.html new file mode 100644 index 000000000..3b654384f --- /dev/null +++ b/logging_8cc.html @@ -0,0 +1,137 @@ + + + + + + + +SOPT: /home/runner/work/sopt/sopt/cpp/sopt/logging.cc File Reference + + + + + + + + + + + + +++++ + + + + + + + ++ +
++ + ++ + +SOPT ++Sparse OPTimisation+++ + ++ ++ + ++++Namespaces | +Functions+++logging.cc File Reference++ +#include "sopt/logging.h"
+#include <ctime>
+#include <iostream>
+#include <ostream>
+#include <unistd.h>
+++ Include dependency graph for logging.cc:+++ +Go to the source code of this file.
++
+ +Namespaces
+ sopt + + sopt::logging + +
++ +Functions
+ void sopt::logging::_updateLevels (const Log::LevelMap &defaultLevels, Log::LogMap &existingLogs) + + ostream & sopt::logging::operator<< (Log &log, int level) + Streaming output to a logger must have a Log::Level/int as its first argument. More... +
+Generated by 1.9.1 + + + diff --git a/logging_8cc__incl.map b/logging_8cc__incl.map new file mode 100644 index 000000000..1aeaba5a9 --- /dev/null +++ b/logging_8cc__incl.map @@ -0,0 +1,16 @@ + diff --git a/logging_8cc__incl.md5 b/logging_8cc__incl.md5 new file mode 100644 index 000000000..b2a3bc704 --- /dev/null +++ b/logging_8cc__incl.md5 @@ -0,0 +1 @@ +5a709de0893e29e134fc043fb4efe5ba \ No newline at end of file diff --git a/logging_8cc__incl.png b/logging_8cc__incl.png new file mode 100644 index 000000000..ebc90c0d3 Binary files /dev/null and b/logging_8cc__incl.png differ diff --git a/logging_8cc_source.html b/logging_8cc_source.html new file mode 100644 index 000000000..e4c5edb23 --- /dev/null +++ b/logging_8cc_source.html @@ -0,0 +1,304 @@ + + + + + + + +SOPT: /home/runner/work/sopt/sopt/cpp/sopt/logging.cc Source File + + + + + + + + + + + + +++++ + + + + + + + ++ +
++ + ++ + +SOPT ++Sparse OPTimisation+++ + ++ ++ + +++++logging.cc+Go to the documentation of this file.+ ++ + + + + + + + + + + + + + + + + + + + + + + + + + + + +32 for (Log::LevelMap::const_iterator lev = defaultLevels.begin(); lev != defaultLevels.end(); ++lev) {+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ++Logging system for controlled & formatted writing to stdout.Definition: logging.h:14+std::map< std::string, int > LevelMapTypedef for a collection of named log levels.Definition: logging.h:33+ + + + + +bool isActive(int level) constWill this log level produce output on this logger at the moment?Definition: logging.h:118+ +Definition: logging.cc:9+ostream & operator<<(Log &log, int level)Streaming output to a logger must have a Log::Level/int as its first argument.Definition: logging.cc:190+void _updateLevels(const Log::LevelMap &defaultLevels, Log::LogMap &existingLogs)Definition: logging.cc:30
+Generated by 1.9.1 + + + diff --git a/logging_8disabled_8h.html b/logging_8disabled_8h.html deleted file mode 100644 index b634a919e..000000000 --- a/logging_8disabled_8h.html +++ /dev/null @@ -1,233 +0,0 @@ - - - - - - - -SOPT: /home/runner/work/sopt/sopt/cpp/sopt/logging.disabled.h File Reference - - - - - - - - - - - - ----- - - - - - - - -- -
-- - -- - -SOPT --Sparse OPTimisation--- - -- -- - -- ----logging.disabled.h File Reference-- -#include "sopt/config.h"
-#include <memory>
-#include <string>
-- Include dependency graph for logging.disabled.h:--- --- This graph shows which files directly or indirectly include this file:--- -Go to the source code of this file.
--
- -Namespaces
- sopt - - sopt::logging - -
- -Macros
- #define SOPT_LOG_(...) ((void)0) - \macro For internal use only More... - -
- -Functions
- std::shared_ptr< int > sopt::logging::initialize (std::string const &name="") - Initializes a logger. More... - - std::shared_ptr< int > sopt::logging::initialize () - - std::shared_ptr< int > sopt::logging::get (std::string const &name="") - Returns shared pointer to logger or null if it does not exist. More... - - std::shared_ptr< int > sopt::logging::get () - - void sopt::logging::set_level (std::string const &level, std::string const &name) - Sets loggin level. More... - - void sopt::logging::set_level (std::string const &) - - bool sopt::logging::has_level (std::string const &, std::string const &) - -
-- -Variables
- const std::string sopt::logging::name_prefix = "sopt::" - Name of the sopt logger. More... - Macro Definition Documentation
- -◆ SOPT_LOG_
- -----
-- -#define SOPT_LOG_ -( -- ... ) -((void)0) -- --\macro For internal use only
- -Definition at line 22 of file logging.disabled.h.
- -
-Generated by 1.9.1 - - - diff --git a/logging_8disabled_8h__dep__incl.map b/logging_8disabled_8h__dep__incl.map deleted file mode 100644 index 6f07b6240..000000000 --- a/logging_8disabled_8h__dep__incl.map +++ /dev/null @@ -1,52 +0,0 @@ - diff --git a/logging_8disabled_8h__dep__incl.md5 b/logging_8disabled_8h__dep__incl.md5 deleted file mode 100644 index ab8b79d78..000000000 --- a/logging_8disabled_8h__dep__incl.md5 +++ /dev/null @@ -1 +0,0 @@ -aecbd77aa2cb1648d0e0916c446ae69b \ No newline at end of file diff --git a/logging_8disabled_8h__dep__incl.png b/logging_8disabled_8h__dep__incl.png deleted file mode 100644 index aa7c4b9cf..000000000 Binary files a/logging_8disabled_8h__dep__incl.png and /dev/null differ diff --git a/logging_8disabled_8h__incl.map b/logging_8disabled_8h__incl.map deleted file mode 100644 index 0bbecefbe..000000000 --- a/logging_8disabled_8h__incl.map +++ /dev/null @@ -1,6 +0,0 @@ - diff --git a/logging_8disabled_8h__incl.md5 b/logging_8disabled_8h__incl.md5 deleted file mode 100644 index 8914e7a7e..000000000 --- a/logging_8disabled_8h__incl.md5 +++ /dev/null @@ -1 +0,0 @@ -bd50085fbb967259204b4b626fd295b0 \ No newline at end of file diff --git a/logging_8disabled_8h__incl.png b/logging_8disabled_8h__incl.png deleted file mode 100644 index e96a744ff..000000000 Binary files a/logging_8disabled_8h__incl.png and /dev/null differ diff --git a/logging_8disabled_8h_source.html b/logging_8disabled_8h_source.html deleted file mode 100644 index d8bb84fdd..000000000 --- a/logging_8disabled_8h_source.html +++ /dev/null @@ -1,115 +0,0 @@ - - - - - - - -SOPT: /home/runner/work/sopt/sopt/cpp/sopt/logging.disabled.h Source File - - - - - - - - - - - - ----- - - - - - - - -- -
-- - -- - -SOPT --Sparse OPTimisation--- - -- -- - -----logging.disabled.h-Go to the documentation of this file.- -- - - - - - - - - - - - - - - - - - - - --Definition: logging.disabled.h:8-void set_level(std::string const &, std::string const &)Sets loggin level.Definition: logging.disabled.h:16-std::shared_ptr< int > get(std::string const &)Returns shared pointer to logger or null if it does not exist.Definition: logging.disabled.h:14- -std::shared_ptr< int > initialize(std::string const &)Initializes a logger.Definition: logging.disabled.h:12-bool has_level(std::string const &, std::string const &)Definition: logging.disabled.h:18
-Generated by 1.9.1 - - - diff --git a/logging_8enabled_8h.html b/logging_8enabled_8h.html deleted file mode 100644 index 274e02daa..000000000 --- a/logging_8enabled_8h.html +++ /dev/null @@ -1,255 +0,0 @@ - - - - - - - -SOPT: /home/runner/work/sopt/sopt/cpp/sopt/logging.enabled.h File Reference - - - - - - - - - - - - ----- - - - - - - - -- -
-- - -- - -SOPT --Sparse OPTimisation--- - -- -- - -- ----logging.enabled.h File Reference-- -#include "sopt/config.h"
-#include <memory>
-#include <string>
-#include <Eigen/Core>
-#include <spdlog/fmt/ostr.h>
-#include <spdlog/spdlog.h>
-#include <spdlog/sinks/stdout_sinks.h>
-#include "sopt/exception.h"
--- Include dependency graph for logging.enabled.h:--- -Go to the source code of this file.
--
- -Namespaces
- sopt - - sopt::logging - -
- -Macros
- #define SOPT_MACRO(LEVEL) if (level == #LEVEL) logger->set_level(spdlog::level::LEVEL) - - #define SOPT_MACRO(LEVEL) if (level == #LEVEL) return logger->level() >= spdlog::level::LEVEL - - #define SOPT_LOG_(NAME, TYPE, ...) - \macro For internal use only More... - -
- -Typedefs
- using spdlogPtr = std::shared_ptr< spdlog::logger > - -
-- -Functions
- void sopt::logging::set_level (std::string const &level, std::string const &name) - Sets loggin level. More... - - std::shared_ptr< int > sopt::logging::initialize (std::string const &name="") - Initializes a logger. More... - - std::shared_ptr< int > sopt::logging::get (std::string const &name="") - Returns shared pointer to logger or null if it does not exist. More... - - bool sopt::logging::has_level (std::string const &, std::string const &) - Macro Definition Documentation
- -◆ SOPT_LOG_
- --- ---
-- -#define SOPT_LOG_ -( -- NAME, -- -- - - TYPE, -- -- - - ... -- -- ) -- -Value:---sopt_logging_##__func__##_##__LINE__->TYPE(__VA_ARGS__)--std::shared_ptr< int > get(std::string const &)Returns shared pointer to logger or null if it does not exist.Definition: logging.disabled.h:14\macro For internal use only
- -Definition at line 86 of file logging.enabled.h.
- -◆ SOPT_MACRO [1/2]
- --- ---
-- -#define SOPT_MACRO -( -- LEVEL ) -if (level == #LEVEL) logger->set_level(spdlog::level::LEVEL) -- --◆ SOPT_MACRO [2/2]
- -----
-- -#define SOPT_MACRO -( -- LEVEL ) -if (level == #LEVEL) return logger->level() >= spdlog::level::LEVEL -- --Typedef Documentation
- -◆ spdlogPtr
- -----
-- -using spdlogPtr = std::shared_ptr<spdlog::logger> -- --Definition at line 13 of file logging.enabled.h.
- -
-Generated by 1.9.1 - - - diff --git a/logging_8enabled_8h__incl.map b/logging_8enabled_8h__incl.map deleted file mode 100644 index a0f7a2aa1..000000000 --- a/logging_8enabled_8h__incl.map +++ /dev/null @@ -1,13 +0,0 @@ - diff --git a/logging_8enabled_8h__incl.md5 b/logging_8enabled_8h__incl.md5 deleted file mode 100644 index a1aaaef35..000000000 --- a/logging_8enabled_8h__incl.md5 +++ /dev/null @@ -1 +0,0 @@ -25fe856fb051bbe8fd014e46ae465ba6 \ No newline at end of file diff --git a/logging_8enabled_8h__incl.png b/logging_8enabled_8h__incl.png deleted file mode 100644 index 9a2dc6c71..000000000 Binary files a/logging_8enabled_8h__incl.png and /dev/null differ diff --git a/logging_8enabled_8h_source.html b/logging_8enabled_8h_source.html deleted file mode 100644 index de0f5efb9..000000000 --- a/logging_8enabled_8h_source.html +++ /dev/null @@ -1,177 +0,0 @@ - - - - - - - -SOPT: /home/runner/work/sopt/sopt/cpp/sopt/logging.enabled.h Source File - - - - - - - - - - - - ----- - - - - - - - -- -
-- - -- - -SOPT --Sparse OPTimisation--- - -- -- - -----logging.enabled.h-Go to the documentation of this file.- -- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- -#define SOPT_MACRO(LEVEL)-Definition: proximal_expression.h:90-Definition: logging.disabled.h:8-void set_level(std::string const &, std::string const &)Sets loggin level.Definition: logging.disabled.h:16-std::shared_ptr< int > get(std::string const &)Returns shared pointer to logger or null if it does not exist.Definition: logging.disabled.h:14-std::shared_ptr< int > initialize(std::string const &)Initializes a logger.Definition: logging.disabled.h:12- - -bool has_level(std::string const &, std::string const &)Definition: logging.disabled.h:18
-Generated by 1.9.1 - - - diff --git a/logging_8h.html b/logging_8h.html index 4f97a7d24..f46a4ad25 100644 --- a/logging_8h.html +++ b/logging_8h.html @@ -76,13 +76,19 @@logging.h File Reference#include "sopt/config.h"
-#include "sopt/logging.disabled.h"
+#include "sopt/exception.h"
+#include <map>
+#include <memory>
+#include <cstring>
Include dependency graph for logging.h:@@ -90,11 +96,15 @@@@ -104,89 +114,129 @@Go to the source code of this file.
+
+ +Classes
+ class sopt::logging::Log + Logging system for controlled & formatted writing to stdout. More... + +
+ +Namespaces
+ sopt + + sopt::logging +
- Macros
+ #define SOPT_NOTICE(...) SOPT_LOG_(, critical, __VA_ARGS__) + #define SOPT_MSG_LVL(lvl, ...) + Neat CPU-conserving logging macros. Use by preference! More... + + #define SOPT_LOG_(TYPE, ...) SOPT_MSG_LVL(sopt::logging::Log::TYPE, __VA_ARGS__) + \macro For internal use only More... + #define SOPT_NOTICE(...) SOPT_LOG_(critical, __VA_ARGS__) \macro Normal but significant condition or critical error More... - + #define SOPT_ERROR(...) SOPT_LOG_(, error, __VA_ARGS__) #define SOPT_ERROR(...) SOPT_LOG_(error, __VA_ARGS__) \macro Something is definitely wrong, algorithm exits More... - + #define SOPT_WARN(...) SOPT_LOG_(, warn, __VA_ARGS__) #define SOPT_WARN(...) SOPT_LOG_(warn, __VA_ARGS__) \macro Something might be going wrong More... - + #define SOPT_INFO(...) SOPT_LOG_(, info, __VA_ARGS__) #define SOPT_INFO(...) SOPT_LOG_(info, __VA_ARGS__) \macro Verbose informational message about normal condition More... - + #define SOPT_DEBUG(...) SOPT_LOG_(, debug, __VA_ARGS__) #define SOPT_DEBUG(...) SOPT_LOG_(debug, __VA_ARGS__) \macro Output some debugging More... - + #define SOPT_TRACE(...) SOPT_LOG_(, trace, __VA_ARGS__) #define SOPT_TRACE(...) SOPT_LOG_(trace, __VA_ARGS__) - + #define SOPT_HIGH_LOG(...) SOPT_LOG_(, critical, __VA_ARGS__) #define SOPT_HIGH_LOG(...) SOPT_LOG_(critical, __VA_ARGS__) High priority message. More... - + #define SOPT_MEDIUM_LOG(...) SOPT_LOG_(, info, __VA_ARGS__) #define SOPT_MEDIUM_LOG(...) SOPT_LOG_(info, __VA_ARGS__) Medium priority message. More... - + #define SOPT_LOW_LOG(...) SOPT_LOG_(, debug, __VA_ARGS__) #define SOPT_LOW_LOG(...) SOPT_LOG_(debug, __VA_ARGS__) Low priority message. More... + +
+ +Functions
+ ostream & sopt::logging::operator<< (Log &log, int level) + Streaming output to a logger must have a Log::Level/int as its first argument. More... + + Log & sopt::logging::getLog () + Access method to default Log object. More... + + void sopt::logging::set_level (const std::string &level) + Method to set the logging level of the default Log object. More... + + template<typename Arg > + void sopt::logging::applyFormat (std::stringstream &ss, char *&pos, Arg &&arg) + + template<typename... Args> + std::string sopt::logging::mkFormattedString (const char *txt, Args &&... args) + Helper method to construct formatted string. More... + + const std::string & sopt::logging::mkFormattedString (const std::string &txt) Macro Definition Documentation
@@ -200,14 +250,14 @@
... ) -SOPT_LOG_(, debug, __VA_ARGS__) +SOPT_LOG_(debug, __VA_ARGS__)
\macro Verbose informational message about normal condition
- +\macro Normal but significant condition or critical error
- +\macro Output internal values of no interest to anyone
Except maybe when debugging.
- ++ |
+ SOPT
+
+ Sparse OPTimisation
+ |
+
Logging macros |
References cargs, sopt::logging::initialize(), and N.
+ diff --git a/mpi__session_8cc__incl.map b/mpi__session_8cc__incl.map index 519498423..05d6fdf7b 100644 --- a/mpi__session_8cc__incl.map +++ b/mpi__session_8cc__incl.map @@ -4,10 +4,14 @@ - - - - - - + + + + + + + + + + diff --git a/mpi__session_8cc__incl.md5 b/mpi__session_8cc__incl.md5 index 57731dc14..1da336f18 100644 --- a/mpi__session_8cc__incl.md5 +++ b/mpi__session_8cc__incl.md5 @@ -1 +1 @@ -e0934cc79ad12bdcfdc53f3f026c50fd \ No newline at end of file +c42cbb502e53a9f2131987ec96ca7c2d \ No newline at end of file diff --git a/mpi__session_8cc__incl.png b/mpi__session_8cc__incl.png index a2b602bc4..5c2537ffd 100644 Binary files a/mpi__session_8cc__incl.png and b/mpi__session_8cc__incl.png differ diff --git a/mpi__session_8cc_source.html b/mpi__session_8cc_source.html index 62f4310cd..7c8658819 100644 --- a/mpi__session_8cc_source.html +++ b/mpi__session_8cc_source.html @@ -119,17 +119,14 @@ - - - - - + + + -References a, b, SOPT_LOW_LOG, and SOPT_THROW.
+References a, b, SOPT_LOW_LOG, and SOPT_THROW.
Referenced by sopt::credible_region::find_credible_interval(), and TEST_CASE().
@@ -796,36 +793,6 @@
-
|
- -inlineconstexpr | -
Wether to add color to the logger.
- -Definition at line 43 of file config.in.h.
-Definition at line 46 of file config.in.h.
+Definition at line 43 of file config.in.h.
+Definition at line 40 of file config.in.h.
+Definition at line 50 of file config.in.h.
+Definition at line 31 of file config.in.h.
+Definition at line 34 of file config.in.h.
+References sopt::LinearTransform< VECTOR >::adjoint(), and SOPT_DEBUG.
+References sopt::LinearTransform< VECTOR >::adjoint(), and SOPT_DEBUG.
Referenced by normalise_operator().
diff --git a/namespacesopt_1_1credible__region.html b/namespacesopt_1_1credible__region.html index 8d3e34df9..904b6bc11 100644 --- a/namespacesopt_1_1credible__region.html +++ b/namespacesopt_1_1credible__region.html @@ -152,9 +152,9 @@References N, SOPT_MEDIUM_LOG, and SOPT_THROW.
+References N, SOPT_MEDIUM_LOG, and SOPT_THROW.
Referenced by credible_interval(), and TEST_CASE().
@@ -385,12 +385,12 @@References cols, find_credible_interval(), rows, SOPT_LOW_LOG, and SOPT_THROW.
+References cols, find_credible_interval(), rows, SOPT_LOW_LOG, and SOPT_THROW.
diff --git a/namespacesopt_1_1logging.html b/namespacesopt_1_1logging.html index b163e72e4..2d1a75edc 100644 --- a/namespacesopt_1_1logging.html +++ b/namespacesopt_1_1logging.html @@ -76,119 +76,111 @@+Classes | |
class | Log |
Logging system for controlled & formatted writing to stdout. More... | |
Functions | |
std::shared_ptr< int > | initialize (std::string const &name="") |
Initializes a logger. More... | |
std::shared_ptr< int > | initialize () |
std::shared_ptr< int > | get (std::string const &name="") |
Returns shared pointer to logger or null if it does not exist. More... | |
std::shared_ptr< int > | get () |
void | set_level (std::string const &level, std::string const &name) |
Sets loggin level. More... | |
void | set_level (std::string const &) |
bool | has_level (std::string const &, std::string const &) |
-Variables | |
const std::string | name_prefix = "sopt::" |
Name of the sopt logger. More... | |
void | _updateLevels (const Log::LevelMap &defaultLevels, Log::LogMap &existingLogs) |
ostream & | operator<< (Log &log, int level) |
Streaming output to a logger must have a Log::Level/int as its first argument. More... | |
Log & | getLog () |
Access method to default Log object. More... | |
void | set_level (const std::string &level) |
Method to set the logging level of the default Log object. More... | |
template<typename Arg > | |
void | applyFormat (std::stringstream &ss, char *&pos, Arg &&arg) |
template<typename... Args> | |
std::string | mkFormattedString (const char *txt, Args &&... args) |
Helper method to construct formatted string. More... | |
const std::string & | mkFormattedString (const std::string &txt) |
|
- -inline | -
Definition at line 15 of file logging.disabled.h.
- -
-
|
- -inline | -
Returns shared pointer to logger or null if it does not exist.
- -Definition at line 14 of file logging.disabled.h.
-Definition at line 30 of file logging.cc.
+Referenced by sopt::logging::Log::setLevels().
+
+
+template<typename Arg >
+
-
-Helper method to ireplace a set of curly braces with the template argument arg in a string stream -Definition at line 18 of file logging.disabled.h. -
+
Definition at line 162 of file logging.h. +
+
+
+
+
+
+
+
+
+
+
+References SOPT_THROW. + +Referenced by mkFormattedString(). +◆ initialize() [1/2]+ +◆ getLog()
@@ -218,7 +220,7 @@
std::shared_ptr<int> sopt::logging::initialize |
+ Log& sopt::logging::getLog |
( |
) |
@@ -231,26 +233,45 @@ |
-Access method to default Log object. + +Definition at line 151 of file logging.h. +
+
+References sopt::logging::Log::getLog(). + +Referenced by set_level(). + |
|
@@ -260,18 +281,25 @@
void sopt::logging::set_level | +const std::string& sopt::logging::mkFormattedString | ( | -std::string const & | -) | +const std::string & | +txt | ) |
Definition at line 17 of file logging.disabled.h.
-
-
-Sets loggin level. -Levels can be one of
Streaming output to a logger must have a Log::Level/int as its first argument. +The streaming operator can use Log's internals. -Definition at line 16 of file logging.disabled.h. -
+
Definition at line 190 of file logging.cc. +
+
+
+
+
+
+
+
+
+
+
+
+
+
-Referenced by main(), and TEST_CASE(). -Variable Documentation- -◆ name_prefix+ +◆ set_level()
+
-
Name of the sopt logger. +Method to set the logging level of the default Log object. -Definition at line 10 of file logging.disabled.h. +Definition at line 154 of file logging.h. +
+
+
+
+static void setLevel(const std::string &name, int level) Set the log levels. References sopt::logging::Log::getLevelFromName(), getLog(), and sopt::logging::Log::setLevel(). + +Referenced by main(), and TEST_CASE(). 67 }
-#define SOPT_ERROR(...) \macro Something is definitely wrong, algorithm exits Definition: logging.h:15 #define SOPT_ERROR(...) \macro Something is definitely wrong, algorithm exits Definition: logging.h:211 References SOPT_LOW_LOG, SOPT_MEDIUM_LOG, and SOPT_THROW. +References SOPT_LOW_LOG, SOPT_MEDIUM_LOG, and SOPT_THROW. Referenced by main(), and sopt::notinstalled::read_standard_tiff(). @@ -781,9 +781,9 @@ 100 TIFFClose(tif);
-
+
-WaveletData const & daubechies_data(t_uint n) Factory function returning specific daubechie wavelet data. Definition: wavelet_data.cc:1597 Referenced by direct_matrix(), direct_vector(), sopt::wavelets::SARA::emplace_back(), indirect_matrix(), indirect_vector(), main(), and TEST_CASE(). diff --git a/objective__functions_8h.html b/objective__functions_8h.html index bd2cb0420..5901f7546 100644 --- a/objective__functions_8h.html +++ b/objective__functions_8h.html @@ -97,27 +97,28 @@
diff --git a/objective__functions_8h__incl.map b/objective__functions_8h__incl.map
index d4863f5e2..3503e867b 100644
--- a/objective__functions_8h__incl.map
+++ b/objective__functions_8h__incl.map
@@ -1,23 +1,24 @@
diff --git a/objective__functions_8h__incl.md5 b/objective__functions_8h__incl.md5
index 652db063e..42ba6466c 100644
--- a/objective__functions_8h__incl.md5
+++ b/objective__functions_8h__incl.md5
@@ -1 +1 @@
-b6fc7c1ca2f40ca5df30def81740b034
\ No newline at end of file
+b76c8efaff5dc0ca485c0e1d89093abb
\ No newline at end of file
diff --git a/objective__functions_8h__incl.png b/objective__functions_8h__incl.png
index 40ef12a50..ce54ed6e5 100644
Binary files a/objective__functions_8h__incl.png and b/objective__functions_8h__incl.png differ
diff --git a/ort__model_8cc.html b/ort__model_8cc.html
index ecacfcde5..b9db534ec 100644
--- a/ort__model_8cc.html
+++ b/ort__model_8cc.html
@@ -93,26 +93,29 @@
diff --git a/ort__model_8cc__incl.map b/ort__model_8cc__incl.map
index e716e99d5..db5c4e025 100644
--- a/ort__model_8cc__incl.map
+++ b/ort__model_8cc__incl.map
@@ -1,22 +1,25 @@
diff --git a/ort__model_8cc__incl.md5 b/ort__model_8cc__incl.md5
index 7b9d9a550..94f1ac0f5 100644
--- a/ort__model_8cc__incl.md5
+++ b/ort__model_8cc__incl.md5
@@ -1 +1 @@
-147db2f9b14db5cd5648b67515124b72
\ No newline at end of file
+f15c494722bf38c0e84cf42e84feb901
\ No newline at end of file
diff --git a/ort__model_8cc__incl.png b/ort__model_8cc__incl.png
index 783ad472f..8262e71da 100644
Binary files a/ort__model_8cc__incl.png and b/ort__model_8cc__incl.png differ
diff --git a/ort__session_8h.html b/ort__session_8h.html
index d418bad9d..90d309e84 100644
--- a/ort__session_8h.html
+++ b/ort__session_8h.html
@@ -98,18 +98,21 @@
diff --git a/padmm_8cc__incl.map b/padmm_8cc__incl.map
index 580764452..0bb55a3ba 100644
--- a/padmm_8cc__incl.map
+++ b/padmm_8cc__incl.map
@@ -1,35 +1,36 @@
diff --git a/padmm_8h__incl.map b/padmm_8h__incl.map
index 5847ad084..5d7cf3fb8 100644
--- a/padmm_8h__incl.map
+++ b/padmm_8h__incl.map
@@ -1,25 +1,26 @@
@@ -277,13 +278,13 @@ #define SOPT_ERROR(...) \macro Something is definitely wrong, algorithm exits Definition: logging.h:15 #define SOPT_ERROR(...) \macro Something is definitely wrong, algorithm exits Definition: logging.h:211 Definition: forward_backward.h:14 LinearTransform< VECTOR > linear_transform(OperatorFunction< VECTOR > const &direct, OperatorFunction< VECTOR > const &indirect, std::array< t_int, 3 > const &sizes={{1, 1, 0}}) Definition: linear_transform.h:101
|
References sopt::algorithm::ProximalADMM< SCALAR >::is_converged(), N, sopt::algorithm::ProximalADMM< SCALAR >::Phi(), SOPT_TRACE, and sopt::proximal::translate().
+References sopt::algorithm::ProximalADMM< SCALAR >::is_converged(), N, sopt::algorithm::ProximalADMM< SCALAR >::Phi(), SOPT_TRACE, and sopt::proximal::translate().
diff --git a/padmm__warm__start_8cc__incl.map b/padmm__warm__start_8cc__incl.map index 0c7b83897..7e991b855 100644 --- a/padmm__warm__start_8cc__incl.map +++ b/padmm__warm__start_8cc__incl.map @@ -1,31 +1,32 @@References sopt::logging::initialize(), sopt::algorithm::ProximalADMM< SCALAR >::is_converged(), N, and sopt::proximal::translate().
+References sopt::algorithm::ProximalADMM< SCALAR >::is_converged(), N, and sopt::proximal::translate().
diff --git a/proximal__admm_2euclidian__norm_8cc__incl.map b/proximal__admm_2euclidian__norm_8cc__incl.map index a01b86c79..839422e65 100644 --- a/proximal__admm_2euclidian__norm_8cc__incl.map +++ b/proximal__admm_2euclidian__norm_8cc__incl.map @@ -1,29 +1,30 @@References sopt::algorithm::SDMM< SCALAR >::conjugate_gradient(), sopt::epsilon(), sopt::logging::initialize(), N, SOPT_TRACE, and sopt::proximal::translate().
+References sopt::algorithm::SDMM< SCALAR >::conjugate_gradient(), sopt::epsilon(), N, SOPT_TRACE, and sopt::proximal::translate().
References sopt::epsilon(), sopt::wavelets::factory(), sopt::Sampling::indices(), sopt::l1_norm(), sopt::l2_norm(), sopt::algorithm::ImagingProximalADMM< SCALAR >::l2ball_proximal(), mersenne(), N, sopt::notinstalled::read_standard_tiff(), sopt::sigma(), and SOPT_LOW_LOG.
+References sopt::epsilon(), sopt::wavelets::factory(), sopt::Sampling::indices(), sopt::l1_norm(), sopt::l2_norm(), sopt::algorithm::ImagingProximalADMM< SCALAR >::l2ball_proximal(), mersenne(), N, sopt::notinstalled::read_standard_tiff(), sopt::sigma(), and SOPT_LOW_LOG.
diff --git a/serial__vs__parallel__padmm_8cc__incl.map b/serial__vs__parallel__padmm_8cc__incl.map index 8bb5758e3..bd2edf948 100644 --- a/serial__vs__parallel__padmm_8cc__incl.map +++ b/serial__vs__parallel__padmm_8cc__incl.map @@ -1,52 +1,52 @@+ |
+ SOPT
+
+ Sparse OPTimisation
+ |
+
#include <iostream>
#include <random>
#include <vector>
#include <ctime>
#include <Eigen/Eigenvalues>
#include "sopt/types.h"
#include "sopt/gradient_operator.h"
Definition at line 28 of file tv_inpainting.cc.
-Definition at line 29 of file tv_inpainting.cc.
+References sopt::dirty(), sopt::epsilon(), sopt::logging::initialize(), mersenne(), sopt::algorithm::TVPrimalDual< SCALAR >::Phi(), sopt::algorithm::TVPrimalDual< SCALAR >::Psi(), sopt::notinstalled::read_standard_tiff(), sopt::algorithm::TVPrimalDual< SCALAR >::residual_convergence(), sopt::sigma(), SOPT_HIGH_LOG, and sopt::utilities::write_tiff().
+References sopt::dirty(), sopt::epsilon(), mersenne(), sopt::algorithm::TVPrimalDual< SCALAR >::Phi(), sopt::algorithm::TVPrimalDual< SCALAR >::Psi(), sopt::notinstalled::read_standard_tiff(), sopt::algorithm::TVPrimalDual< SCALAR >::residual_convergence(), sopt::sigma(), SOPT_HIGH_LOG, and sopt::utilities::write_tiff().
diff --git a/tv__inpainting_8cc__incl.map b/tv__inpainting_8cc__incl.map index 5ea4907a2..f05c5cd0f 100644 --- a/tv__inpainting_8cc__incl.map +++ b/tv__inpainting_8cc__incl.map @@ -1,42 +1,44 @@