From 962f65760add0b1dbfbb07f242036825adcb53b2 Mon Sep 17 00:00:00 2001 From: tkoskela <> Date: Thu, 13 Jun 2024 15:43:44 +0000 Subject: [PATCH] =?UTF-8?q?Deploying=20to=20gh-pages=20from=20@=20astro-in?= =?UTF-8?q?formatics/sopt@9cbc7926a1a131d9cdfc7cf65b42a3ebfc0a302d=20?= =?UTF-8?q?=F0=9F=9A=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- copy__tiff_8cc.html | 6 +- copy__tiff_8cc_source.html | 4 +- cppflow__model_8cc.html | 10 +- cppflow__model_8cc_source.html | 8 +- directories_8in_8h.html | 20 +-- directories_8in_8h_source.html | 18 +-- ...es_2forward__backward_2inpainting_8cc.html | 6 +- ...ward__backward_2inpainting_8cc_source.html | 4 +- examples_2primal__dual_2inpainting_8cc.html | 6 +- ..._2primal__dual_2inpainting_8cc_source.html | 4 +- examples_2proximal__admm_2inpainting_8cc.html | 6 +- ...proximal__admm_2inpainting_8cc_source.html | 4 +- examples_2proximal__admm_2reweighted_8cc.html | 6 +- ...proximal__admm_2reweighted_8cc_source.html | 4 +- examples_2sdmm_2inpainting_8cc.html | 6 +- examples_2sdmm_2inpainting_8cc_source.html | 4 +- examples_2sdmm_2reweighted_8cc.html | 6 +- examples_2sdmm_2reweighted_8cc_source.html | 4 +- gradient__operator_8cc.html | 6 +- gradient__operator_8cc_source.html | 4 +- inpainting__credible__interval_8cc.html | 8 +- ...inting__credible__interval_8cc_source.html | 6 +- inpainting__joint__map_8cc.html | 6 +- inpainting__joint__map_8cc_source.html | 4 +- l2__inpainting_8cc.html | 6 +- l2__inpainting_8cc_source.html | 4 +- namespacemembers.html | 8 +- namespacemembers_func.html | 8 +- namespaces.html | 36 +++--- namespacesopt.html | 4 +- ...talled.html => namespacesopt_1_1tools.html | 64 ++++----- namespacesopt_1_1utilities.html | 2 +- ort__model_8cc.html | 18 +-- ort__model_8cc_source.html | 10 +- search/all_10.js | 2 +- search/all_11.js | 122 +++++++++--------- search/all_4.js | 2 +- search/all_c.js | 2 +- search/all_e.js | 2 +- search/functions_10.js | 2 +- search/functions_4.js | 2 +- search/functions_c.js | 2 +- search/functions_e.js | 2 +- search/namespaces_1.js | 8 +- serial__vs__parallel__padmm_8cc.html | 6 +- serial__vs__parallel__padmm_8cc_source.html | 4 +- sopt.tag | 92 ++++++------- tests_2inpainting_8cc.html | 6 +- tests_2inpainting_8cc_source.html | 4 +- tf__inpainting_8cc.html | 10 +- tf__inpainting_8cc_source.html | 8 +- tiffwrappers_8cc.html | 8 +- tiffwrappers_8cc_source.html | 14 +- tiffwrappers_8h.html | 8 +- tiffwrappers_8h_source.html | 10 +- tv__inpainting_8cc.html | 6 +- tv__inpainting_8cc_source.html | 4 +- 57 files changed, 323 insertions(+), 323 deletions(-) rename namespacesopt_1_1notinstalled.html => namespacesopt_1_1tools.html (71%) diff --git a/copy__tiff_8cc.html b/copy__tiff_8cc.html index 6592276c..c67baba5 100644 --- a/copy__tiff_8cc.html +++ b/copy__tiff_8cc.html @@ -168,18 +168,18 @@

20  }
21 
22  // Read input file
-
23  auto const image = sopt::notinstalled::read_standard_tiff(argv[1]);
+
23  auto const image = sopt::tools::read_standard_tiff(argv[1]);
24  sopt::utilities::write_tiff(image, argv[2]);
25 
26  auto const reread = sopt::utilities::read_tiff(argv[2]);
27 
28  return 0;
29 }
-
Image read_standard_tiff(std::string const &name)
Reads tiff image from sopt data directory if it exists.
Definition: tiffwrappers.cc:9
+
Image read_standard_tiff(std::string const &name)
Reads tiff image from sopt data directory if it exists.
Definition: tiffwrappers.cc:9
void write_tiff(Image<> const &image, std::string const &filename)
Writes a tiff greyscale file.
Definition: utilities.cc:68
Image read_tiff(std::string const &filename)
Reads tiff image.
Definition: utilities.cc:38
-

References sopt::notinstalled::read_standard_tiff(), sopt::utilities::read_tiff(), and sopt::utilities::write_tiff().

+

References sopt::tools::read_standard_tiff(), sopt::utilities::read_tiff(), and sopt::utilities::write_tiff().

diff --git a/copy__tiff_8cc_source.html b/copy__tiff_8cc_source.html index 860c449d..65190ef7 100644 --- a/copy__tiff_8cc_source.html +++ b/copy__tiff_8cc_source.html @@ -101,7 +101,7 @@
20  }
21 
22  // Read input file
-
23  auto const image = sopt::notinstalled::read_standard_tiff(argv[1]);
+
23  auto const image = sopt::tools::read_standard_tiff(argv[1]);
24  sopt::utilities::write_tiff(image, argv[2]);
25 
26  auto const reread = sopt::utilities::read_tiff(argv[2]);
@@ -110,7 +110,7 @@
29 }
int main(int argc, char const **argv)
Definition: copy_tiff.cc:14
-
Image read_standard_tiff(std::string const &name)
Reads tiff image from sopt data directory if it exists.
Definition: tiffwrappers.cc:9
+
Image read_standard_tiff(std::string const &name)
Reads tiff image from sopt data directory if it exists.
Definition: tiffwrappers.cc:9
void write_tiff(Image<> const &image, std::string const &filename)
Writes a tiff greyscale file.
Definition: utilities.cc:68
Image read_tiff(std::string const &filename)
Reads tiff image.
Definition: utilities.cc:38
diff --git a/cppflow__model_8cc.html b/cppflow__model_8cc.html index 2b92b1c4..bc369345 100644 --- a/cppflow__model_8cc.html +++ b/cppflow__model_8cc.html @@ -199,7 +199,7 @@

24 
25  // read in image
26  std::string const input_image = "cameraman256";
-
27  Image const image = sopt::notinstalled::read_standard_tiff(input_image);
+
27  Image const image = sopt::tools::read_standard_tiff(input_image);
28 
29  int const image_rows = image.rows();
30  int const image_cols = image.cols();
@@ -207,7 +207,7 @@

32  cppflow::tensor input_tensor = sopt::cppflowutils::convert_image_to_tensor(image, image_rows, image_cols);
33 
34  // Read in model
-
35  cppflow::model model(std::string(sopt::notinstalled::models_directory() + "/snr_15_model.pb/"));
+
35  cppflow::model model(std::string(sopt::tools::models_directory() + "/snr_15_model.pb/"));
36 
37  // Run model on image
38  // TODO: Automatically detect the string parameters, see issue #320
@@ -230,10 +230,10 @@

sopt::Image< Scalar > Image
cppflow::tensor convert_image_to_tensor(Image< double > const &image, int image_rows, int image_cols)
Converts a sopt::Image to a cppflow::tensor.
Eigen::Map< Eigen::Array< double, Eigen::Dynamic, Eigen::Dynamic > > convert_tensor_to_image(std::vector< float > model_output, int image_rows, int image_cols)
Convert a cppflow:tensor to an Eigen::Array.
-
std::string models_directory()
Machine-learning models.
-
Image read_standard_tiff(std::string const &name)
Reads tiff image from sopt data directory if it exists.
Definition: tiffwrappers.cc:9
+
Image read_standard_tiff(std::string const &name)
Reads tiff image from sopt data directory if it exists.
Definition: tiffwrappers.cc:9
+
std::string models_directory()
Machine-learning models.
-

References sopt::cppflowutils::convert_image_to_tensor(), sopt::cppflowutils::convert_tensor_to_image(), sopt::notinstalled::models_directory(), and sopt::notinstalled::read_standard_tiff().

+

References sopt::cppflowutils::convert_image_to_tensor(), sopt::cppflowutils::convert_tensor_to_image(), sopt::tools::models_directory(), and sopt::tools::read_standard_tiff().

diff --git a/cppflow__model_8cc_source.html b/cppflow__model_8cc_source.html index a46ec5b0..535cc007 100644 --- a/cppflow__model_8cc_source.html +++ b/cppflow__model_8cc_source.html @@ -105,7 +105,7 @@
24 
25  // read in image
26  std::string const input_image = "cameraman256";
-
27  Image const image = sopt::notinstalled::read_standard_tiff(input_image);
+
27  Image const image = sopt::tools::read_standard_tiff(input_image);
28 
29  int const image_rows = image.rows();
30  int const image_cols = image.cols();
@@ -113,7 +113,7 @@
32  cppflow::tensor input_tensor = sopt::cppflowutils::convert_image_to_tensor(image, image_rows, image_cols);
33 
34  // Read in model
-
35  cppflow::model model(std::string(sopt::notinstalled::models_directory() + "/snr_15_model.pb/"));
+
35  cppflow::model model(std::string(sopt::tools::models_directory() + "/snr_15_model.pb/"));
36 
37  // Run model on image
38  // TODO: Automatically detect the string parameters, see issue #320
@@ -140,8 +140,8 @@
cppflow::tensor convert_image_to_tensor(Image< double > const &image, int image_rows, int image_cols)
Converts a sopt::Image to a cppflow::tensor.
Eigen::Map< Eigen::Array< double, Eigen::Dynamic, Eigen::Dynamic > > convert_tensor_to_image(std::vector< float > model_output, int image_rows, int image_cols)
Convert a cppflow:tensor to an Eigen::Array.
-
std::string models_directory()
Machine-learning models.
-
Image read_standard_tiff(std::string const &name)
Reads tiff image from sopt data directory if it exists.
Definition: tiffwrappers.cc:9
+
Image read_standard_tiff(std::string const &name)
Reads tiff image from sopt data directory if it exists.
Definition: tiffwrappers.cc:9
+
std::string models_directory()
Machine-learning models.
Eigen::Array< T, Eigen::Dynamic, Eigen::Dynamic > Image
A 2-dimensional list of elements of given type.
Definition: types.h:39
diff --git a/directories_8in_8h.html b/directories_8in_8h.html index a6e5ba07..cc0bd9b6 100644 --- a/directories_8in_8h.html +++ b/directories_8in_8h.html @@ -103,20 +103,20 @@ Namespaces

 sopt   -  sopt::notinstalled +  sopt::tools   - - - - - - - - - + + + + + + + + +

Functions

std::string sopt::notinstalled::data_directory ()
 Holds images and such. More...
 
std::string sopt::notinstalled::output_directory ()
 Output artefacts from tests. More...
 
std::string sopt::notinstalled::models_directory ()
 Machine-learning models. More...
 
std::string sopt::tools::data_directory ()
 Holds images and such. More...
 
std::string sopt::tools::output_directory ()
 Output artefacts from tests. More...
 
std::string sopt::tools::models_directory ()
 Machine-learning models. More...
 
diff --git a/directories_8in_8h_source.html b/directories_8in_8h_source.html index b02870bc..96c6ff67 100644 --- a/directories_8in_8h_source.html +++ b/directories_8in_8h_source.html @@ -85,16 +85,16 @@
4 #include "sopt/config.h"
5 #include <string>
6 
-
7 namespace sopt::notinstalled {
-
9 inline std::string data_directory() { return "@PROJECT_SOURCE_DIR@/cpp/tests/test_data"; }
-
11 inline std::string output_directory() { return "@PROJECT_BINARY_DIR@/outputs"; }
-
13 inline std::string models_directory() { return "@PROJECT_SOURCE_DIR@/cpp/tests/test_data"; }
-
14 } // namespace sopt::notinstalled
+
7 namespace sopt::tools {
+
9 inline std::string data_directory() { return "@CMAKE_INSTALL_PREFIX@/cpp/tests/test_data"; }
+
11 inline std::string output_directory() { return "@CMAKE_INSTALL_PREFIX@/outputs"; }
+
13 inline std::string models_directory() { return "@CMAKE_INSTALL_PREFIX@/cpp/tests/test_data"; }
+
14 } // namespace sopt::tools
15 #endif
- -
std::string data_directory()
Holds images and such.
Definition: directories.in.h:9
-
std::string models_directory()
Machine-learning models.
-
std::string output_directory()
Output artefacts from tests.
+ +
std::string output_directory()
Output artefacts from tests.
+
std::string data_directory()
Holds images and such.
Definition: directories.in.h:9
+
std::string models_directory()
Machine-learning models.