Blank module and first draft of solver API.

At this point we have a skeleton of a new module (optim) which can
barely compile properly (unlike previous commit). Besides, there is a
first draft of solver and lpsolver (linear optimization solver) in this
commit.

Author: nailbiter

modules/optim/CMakeLists.txt

@@ -1,2 +1,3 @@
 set(the_description "Generic optimization")
-ocv_define_module(optim)
+ocv_define_module(optim opencv_imgproc)
+#ocv_define_module(optim core)

modules/optim/doc/denoising.rst

@@ -40,46 +40,47 @@
 //
 //M*/
 
-#ifndef __OPENCV_PHOTO_HPP__
-#define __OPENCV_PHOTO_HPP__
+#ifndef __OPENCV_OPTIM_HPP__
+#define __OPENCV_OPTIM_HPP__
 
 #include "opencv2/core.hpp"
-#include "opencv2/imgproc.hpp"
+#include "opencv2/core/mat.hpp"
 
 /*! \namespace cv
  Namespace where all the C++ OpenCV functionality resides
  */
 namespace cv
 {
 
-//! the inpainting algorithm
-enum
+/* //! restores the damaged image areas using one of the available intpainting algorithms */
+class Solver : public Algorithm /* Algorithm is the base OpenCV class */
 {
-    INPAINT_NS    = 0, // Navier-Stokes algorithm
-    INPAINT_TELEA = 1 // A. Telea algorithm
-};
-
-//! restores the damaged image areas using one of the available intpainting algorithms
-CV_EXPORTS_W void inpaint( InputArray src, InputArray inpaintMask,
-                           OutputArray dst, double inpaintRadius, int flags );
+  class Function
+  {
+  public:
+        virtual ~Function();
+        virtual double calc(InputArray args) const = 0;
+        //virtual double calc(InputArray args, OutputArray grad) const = 0;
+  };
 
+  // could be reused for all the generic algorithms like downhill simplex.
+  virtual void solve(InputArray x0, OutputArray result) const = 0;
 
-CV_EXPORTS_W void fastNlMeansDenoising( InputArray src, OutputArray dst, float h = 3,
-                                        int templateWindowSize = 7, int searchWindowSize = 21);
+  virtual void setTermCriteria(const TermCriteria& criteria) = 0;
+  virtual TermCriteria getTermCriteria() = 0;
 
-CV_EXPORTS_W void fastNlMeansDenoisingColored( InputArray src, OutputArray dst,
-                                               float h = 3, float hColor = 3,
-                                               int templateWindowSize = 7, int searchWindowSize = 21);
+  // more detailed API to be defined later ...
 
-CV_EXPORTS_W void fastNlMeansDenoisingMulti( InputArrayOfArrays srcImgs, OutputArray dst,
-                                             int imgToDenoiseIndex, int temporalWindowSize,
-                                             float h = 3, int templateWindowSize = 7, int searchWindowSize = 21);
+};
 
-CV_EXPORTS_W void fastNlMeansDenoisingColoredMulti( InputArrayOfArrays srcImgs, OutputArray dst,
-                                                    int imgToDenoiseIndex, int temporalWindowSize,
-                                                    float h = 3, float hColor = 3,
-                                                    int templateWindowSize = 7, int searchWindowSize = 21);
+class LPSolver : public Solver
+{
+public:
+     virtual void solve(InputArray coeffs, InputArray constraints, OutputArray result) const = 0;
+     // ...
+};
 
-} // cv
+Ptr<LPSolver> createLPSimplexSolver();
+}// cv
 
 #endif

modules/optim/doc/inpainting.rst

@@ -45,4 +45,4 @@
 #error this is a compatibility header which should not be used inside the OpenCV library
 #endif
 
-#include "opencv2/photo.hpp"
+#include "opencv2/optim.hpp"

modules/optim/doc/photo.rst

@@ -1,45 +1,2 @@
-#include "opencv2/opencv.hpp"
-
-namespace cv {
-       	namespace optim {
-
-class Solver : public Algorithm /* Algorithm is base OpenCV class */
-{
-      class Function
-      {
-      public:
-            virtual ~Function() {}
-            virtual double calc(InputArray args) const = 0;
-            virtual double calc(InputArgs, OutputArray grad) const = 0;
-      };
-
-      // could be reused for all the generic algorithms like downhill simplex.
-      virtual void solve(InputArray x0, OutputArray result) const = 0;
-
-      virtual void setTermCriteria(const TermCriteria& criteria) = 0;
-      virtual TermCriteria getTermCriteria() = 0;
-
-      // more detailed API to be defined later ...
-};
-
-class LPSolver : public Solver
-{
-public:
-     virtual void solve(InputArray coeffs, InputArray constraints, OutputArray result) const = 0;
-     // ...
-};
-
-Ptr<LPSolver> createLPSimplexSolver();
-
-}}
-
-/*===============
-Hill climbing solver is more generic one:*/
-/*
-class DownhillSolver : public Solver
-{
-public:
-      // various setters and getters, if needed
-};
-
-Ptr<DownhillSolver> createDownhillSolver(const Ptr<Solver::Function>& func);*/
+#include "precomp.hpp"
+#include "opencv2/optim.hpp"

modules/optim/include/opencv2/photo.hpp renamed to modules/optim/include/opencv2/optim.hpp

@@ -0,0 +1,44 @@
+/*M///////////////////////////////////////////////////////////////////////////////////////
+//
+//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
+//
+//  By downloading, copying, installing or using the software you agree to this license.
+//  If you do not agree to this license, do not download, install,
+//  copy or use the software.
+//
+//
+//                        Intel License Agreement
+//                For Open Source Computer Vision Library
+//
+// Copyright (C) 2000, Intel Corporation, all rights reserved.
+// Third party copyrights are property of their respective owners.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+//   * Redistribution's of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//
+//   * Redistribution's in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//
+//   * The name of Intel Corporation may not be used to endorse or promote products
+//     derived from this software without specific prior written permission.
+//
+// This software is provided by the copyright holders and contributors "as is" and
+// any express or implied warranties, including, but not limited to, the implied
+// warranties of merchantability and fitness for a particular purpose are disclaimed.
+// In no event shall the Intel Corporation or contributors be liable for any direct,
+// indirect, incidental, special, exemplary, or consequential damages
+// (including, but not limited to, procurement of substitute goods or services;
+// loss of use, data, or profits; or business interruption) however caused
+// and on any theory of liability, whether in contract, strict liability,
+// or tort (including negligence or otherwise) arising in any way out of
+// the use of this software, even if advised of the possibility of such damage.
+//
+//M*/
+
+#include "precomp.hpp"
+
+/* End of file. */