Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Commandre Benjamin
OTB
Commits
07254e70
Commit
07254e70
authored
May 17, 2019
by
Antoine Regimbeau
Browse files
Merge branch 'develop' into superbuild_ci-macos
parents
973e835f
e2e5535b
Changes
9
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
07254e70
...
...
@@ -62,7 +62,7 @@ fast-build:
expire_in
:
24 hrs
paths
:
-
log/*.txt
-
build/*/*.log
debian-build
:
extends
:
.common-build
...
...
CI/main_superbuild.cmake
View file @
07254e70
...
...
@@ -133,7 +133,7 @@ set (CONFIGURE_OPTIONS "")
include
(
"
${
CMAKE_CURRENT_LIST_DIR
}
/configure_options.cmake"
)
# For superbuild we need remote module
foreach
(
remote_module
otbGRM
DiapOTBModule OTBTemporalGapFilling
)
#Mosaic # #SertitObject
foreach
(
remote_module DiapOTBModule OTBTemporalGapFilling
)
#otbGRM
#Mosaic # #SertitObject
set
(
CONFIGURE_OPTIONS
"
${
CONFIGURE_OPTIONS
}
-DModule_
${
remote_module
}
:BOOL=ON;"
)
endforeach
()
...
...
Data/Input/Classification/clDT_ModelQB1.dt
View file @
07254e70
...
...
@@ -26,13 +26,13 @@ opencv_ml_dtree:
value
:
1.
norm_class_idx
:
0
splits
:
-
{
var
:
0
,
quality
:
86
.
,
le
:
-8.9000031352043152
e-02
}
-
{
var
:
0
,
quality
:
90
.
,
le
:
2.4664748460054398
e-02
}
-
depth
:
1
value
:
1.
norm_class_idx
:
0
splits
:
-
{
var
:
3
,
quality
:
86
.
,
le
:
-1.
3876452445983887
e+00
}
-
{
var
:
3
,
quality
:
90
.
,
le
:
-1.
2730357646942139
e+00
}
-
depth
:
2
value
:
1.
...
...
@@ -46,7 +46,7 @@ opencv_ml_dtree:
value
:
2.
norm_class_idx
:
1
splits
:
-
{
var
:
1
,
quality
:
86
.
,
le
:
3.4949243068695068
e-01
}
-
{
var
:
2
,
quality
:
90
.
,
le
:
8.2657122611999512
e-01
}
-
depth
:
2
value
:
2.
...
...
Documentation/Cookbook/rst/C++/AboutBandMathX.rst
View file @
07254e70
...
...
@@ -70,8 +70,6 @@ Variables and their descriptions:
| im1PhyX and im1PhyY | spacing of first input in X and Y directions | Scalar |
+-----------------------+--------------------------------------------------------------------------------------+----------+
[variables]
In addition, we also have the generic variables idxX and idxY that
represent the indices of the current pixel (scalars).
...
...
@@ -83,8 +81,6 @@ For instance, the following formula (addition of two pixels)
.. math:: im1+im2
[firstequation]
is correct only if the two first inputs have the same number of bands.
In addition, the following formula is not consistent even if im1
represents a pixel of an image made of only one band:
...
...
@@ -165,7 +161,6 @@ For instance, im1b3N3x5 represents the following neighbourhood:
| . | . | . |
+-----+-----+-----+
[correctness]
Fundamentally, a neighbourhood is represented as a matrix inside the
muParserX framework; so the remark about mathematically well-defined
...
...
@@ -188,7 +183,7 @@ BandMathImageFilterX. These ones can be divided into two categories.
Concerning the last category, here is a list of implemented operators or
functions (they are all implemented in otbParserXPlugins.h/.cxx files
-
OTB/
C
od
e/Common-
):
`
OTB/
M
od
ules/Filtering/MathParserX`
):
**Operators div and dv** The first operator allows the definition of an
element-wise division of two vectors (and even matrices), provided that
...
...
@@ -230,7 +225,7 @@ produces a vector of 4 components made of band 1, band 2, band 1 and
band 1 values from the first input. Note that curly brackets must be
used in order to select the desired band indices.
**
Function dotpr
** This function allows the dot product between two
**Function dotpr** This function allows the dot product between two
vectors or matrices (actually in our case, a kernel and a neighbourhood
of pixels):
...
...
@@ -278,7 +273,7 @@ instance:
.. math:: maj(im1b1N3x3,im1b2N3x3)
**Function vmin and vmax** These functions calculate the min or
max value of a given vector or neighborhood (only one input). For
max value of a given vector or neighborhood (only one input
, the output is a 1x1 matrix
). For
instance:
.. math:: (vmax(im3b1N3x5)+vmin(im3b1N3x5)) ~ div ~ \{2.0\}
...
...
@@ -365,8 +360,8 @@ Functions and operators summary:
+----------------+-------------------------------------------------------------------------------+
| vsqrt | adapation of an existing function to vectors: one input |
+----------------+-------------------------------------------------------------------------------+
[variables]
| vect2scal | one dimensional vector to scalar |
+----------------+-------------------------------------------------------------------------------+
.. _API:
...
...
@@ -454,11 +449,6 @@ defines the kernel1, whose elements are given as follows:
| 1,3 | 1,4 | 1,5 |
+-------+-------+-------+
Definition of kernel1.
[correctness]
::
/** Set a constant */
...
...
Documentation/Cookbook/rst/recipes/improc.rst
View file @
07254e70
...
...
@@ -22,7 +22,7 @@ The naming convention “im[x]b[y]” designates the yth band of the xth
input image.
The *BandMath* application embeds built-in operators and functions
listed in `muparser documentation <http://
muparser.sourceforge.net/mup_features.html
#idDef
2
>`_ thus
listed in `muparser documentation <http
s
://
beltoforion.de/article.php?a=muparser&p=features&s=idDef1
#idDef
1
>`_ thus
allowing a vast choice of possible operations.
Images with no-data values
...
...
Modules/Applications/AppMathParserX/app/otbBandMathX.cxx
View file @
07254e70
...
...
@@ -146,8 +146,8 @@ private:
" - mean
\n
"
" - var
\n
"
" - median
\n
"
" - min
\n
"
" - max
\n
"
" -
v
min
\n
"
" -
v
max
\n
"
" - etc.
\n\n
"
"For instance, if ``im1`` represents the pixel of a 3 bands image::
\n\n
"
...
...
@@ -197,7 +197,7 @@ private:
"into a unique multiband output image."
);
SetDocAuthors
(
"OTB-Team"
);
SetDocSeeAlso
(
"[1] http://
articles.
beltoforion.de/article.php?a=muparserx
\n\n
"
SetDocSeeAlso
(
"[1] http
s
://beltoforion.de/article.php?a=muparserx
\n\n
"
"[2] BandMath"
);
AddDocTag
(
Tags
::
Manip
);
...
...
Packaging/CMakeLists.txt
View file @
07254e70
...
...
@@ -204,8 +204,6 @@ install_importlibs()
install_python_bindings
()
install_java_bindings
()
install_share_dirs
()
install_cmake_files
()
...
...
Packaging/Files/uninstall_otb.bat
View file @
07254e70
...
...
@@ -37,7 +37,6 @@ rd /S /Q lib\otb
del
/S /Q
lib
\otb
*
del
/S /Q
lib
\python\
*
otbApplication
.
*
||
exit
1
del
/S /Q
lib
\java\org.otb.application.jar
||
exit
1
del
/S /Q
bin
\otb
*
||
exit
1
del
/S /Q
bin
\monteverdi.exe
||
exit
1
del
/S /Q
bin
\mapla.exe
||
exit
1
...
...
Packaging/Files/uninstall_otb.sh
View file @
07254e70
...
...
@@ -21,7 +21,7 @@
set
-e
rm
-fr
OUT_DIR/include/OTB-
*
rm
-f
OUT_DIR/lib/
{
libotb
*
,libOTB
*
}
rm
-fr
OUT_DIR/lib/
{
otb,python/
*
otbApplication
*
,java/org.otb.application.jar
}
rm
-fr
OUT_DIR/lib/
{
otb,python/
*
otbApplication
*
}
rm
-fr
OUT_DIR/lib/cmake/OTB-
*
rm
-fr
OUT_DIR/share/otb/
rm
-fv
OUT_DIR/bin/
{
otb
*
,monteverdi,mapla
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment