topo: fix wording

MMVII/Doc/CommandReferences/SysCo.tex

@@ -91,7 +91,7 @@ \chapter{Survey compensation (WIP)}
 
 \section{Survey introduction}
 
-{\tt MMVII} can add survey/topometric measurements in global adjustments.
+{\tt MMVII} can add topographic survey measurements in global adjustments.
 The following measurements types are currently supported :
 
 \begin{itemize}
@@ -101,7 +101,7 @@ \section{Survey introduction}
     \item direct cartesian vector observation
 \end{itemize}
 
-These measurements are made from an instrument that can be verticalized or not.
+These measurements are made from an instrument that can be vertical or not.
 For now, the vertical is modeled as the Earth's ellipsoid normal. Vertical deflection grids may be added later.
 
 The measurements can be made between cameras Ori, GCP or new points (that will be inserted into GCP list).
@@ -166,15 +166,15 @@ \section{{\tt obs} file format}
 They can refer to GCP, cameras or undefined points.
 
 To declare the orientation status of the next station, the following lines have to be
-added to the {\tt obs} file (by default stations are supposed verticalized) :
+added to the {\tt obs} file (by default stations are supposed vertical/plumb) :
 
 \begin{itemize}
-    \item \texttt{\#FIX}: the station verticalized and oriented to North
-    \item \texttt{\#VERT}: the station verticalized, only horizontal orientation is free
+    \item \texttt{\#FIX}: the station vertical and oriented to North
+    \item \texttt{\#VERT}: the station vertical, only horizontal orientation is free
     \item \texttt{\#BASC}: the station orientation has 3 degrees of liberty 
 \end{itemize}
 
-To distinguish several verticalized stations on the same point, the observation code {\tt 7} can be used:
+To distinguish several vertical stations on the same point, the observation code {\tt 7} can be used:
 
 \begin{verbatim}
     7 station target 100 0.001
@@ -191,13 +191,13 @@ \section{{\tt obs} file format}
 
 \section{{\tt TopoAdj} command}
 
-The {\tt TopoAdj} command can perform an adjustment between topometric and GCP constraints.
+The {\tt TopoAdj} command can perform an adjustment between survey and GCP constraints.
 It is used as a substitute to {\tt OriBundleAdj} when there are no cameras.
 
 As for {\tt OriBundleAdj}, when using survey measurements, a RTL SysCo must be used.
 
 The GCP folder must then have a RTL CurSysCo.xml file, and do not have to declare all the points
-refered to by topo observations, but automatic points initialization is not completed.
+referred to by topo observations, but automatic points initialization is not completed.
 
 \begin{verbatim}
    For command : TopoAdj 
@@ -235,21 +235,23 @@ \subsection{Creating the points}
 The points are declared, their initial coordinates and the sigmas on their coordinates constraints
 are given in a GCP file. 
 
-3 points have coordinates constraintes at 1cm ($A$, $B$, $C$). They form an isosceles triangle
+3 points have coordinates constraints at 1cm ($A$, $B$, $C$). They form an isosceles triangle
 on an horizontal plane.
 A 4th point ($D$) is declared above the other. It has no {\tt \_\_Opt\_\_Sigma2} attribute as this point is free.
-(Fig. \ref{fig:topoEx1}).
+(Fig. \ref{fig:topoEx1}). Note that depending on the initial coordinates for $D$, the computation may no succeed
+(e.g. if $A$ and $D$ have the same initial coordinates, the distance formula derivatives are $NaN$).
 
 A {\tt CurSysCo.xml} must come along this GCP file to describe the RTL SysCo.
 
+
 \begin{figure}[!h]
 \centering
 \includegraphics[width=12cm]{Programmer/benchtopo1b.png}
-\caption{The 3 fixed points}
+\caption{The 3 fixed points and the free point}
 \label{fig:topoEx1}
 \end{figure}
 
-The summerized content of the GCP file:
+The summarized content of the GCP file:
 
 \begin{lstlisting}
       <SetGCP>
@@ -286,7 +288,7 @@ \subsection{Creating the points}
 \subsection{Creating the observations}
 
 The distances from $D$ to $A$, $B$ and $C$
-are measured. For redondancy and error evaluation, the distance from $D$ to $C$ is measured twice
+are measured. For redundancy and error evaluation, the distance from $D$ to $C$ is measured twice
 with different values (Fig. \ref{fig:topoEx2}).
 
 \begin{figure}[!h]

MMVII/Doc/Programmer/NonLinearOptim.tex

@@ -1315,11 +1315,11 @@ \section{Survey measurements}
 \label{Chap:TopoProg}
 \subsection{Global presentation}
 
-The premises of a topometric compensation system can be found in \texttt{MMVII/src/Topo/}.
+The premises of a topographic survey compensation system can be found in \texttt{MMVII/src/Topo/}.
 
 For now it is used in commands \texttt{OriBundleAdj} and \texttt{TopoAdj}, and in the Bench \texttt{TopoComp}.
 
-This Bench will be used to illustrate the topometric classes and their usage.
+This Bench will be used to illustrate the survey classes and their usage.
 
 
 \subsection{Frames for survey stations}
@@ -1343,11 +1343,11 @@ \subsection{Frames for survey stations}
 For now, only RTL SysCo is supported.
 
 
-\subsubsection{Topometric classes}
+\subsubsection{Topo survey classes}
 
-The topometric computation classes are :
+The topo computation classes are :
  \begin{itemize}
-    \item \texttt{cTopoPoint}: a point used with topometric measurements. Keeps a pointer to the unknowns from GCP or Ori.
+    \item \texttt{cTopoPoint}: a point used with survey measurements. Keeps a pointer to the unknowns from GCP or Ori.
     \item \texttt{cTopoObs}: an observation corresponding to a formula, between several points.
     \item \texttt{cTopoObsSet}: a set of observations. The set is used to share common parameters between several observations. e.g., \texttt{cTopoObsSetStation} adds a rotation corresponding to an instrument setting.   
     \item \texttt{cBA\_Topo}: the class that handles the least square part. It records all the points and sets.
@@ -1361,7 +1361,7 @@ \subsubsection{Topometric classes}
 It has a notion of {\tt origin} (the point where the instrument is positionned), and an orientation matrix in the RTL SysCo.
 If the station is verticalized, the initial orientation matrix corresponds to the vertical orientation on the origin point, and only a rotation arround the vertical direction is free.
 
-\subsubsection{Topometric equations}
+\subsubsection{Topo survey equations}
 
 For \texttt{cTopoObsSetStation}, all the measurements are expressed in the local survey station frame.
 

MMVII/include/MMVII_Bench.h

@@ -93,7 +93,7 @@ void Bench_EigenDecompos(cParamExeBench & aParam);
 
 void BenchSysCo(cParamExeBench & aParam); ///< SysCo
 
-void BenchTopoComp(cParamExeBench & aParam); ///< Topometric compensation
+void BenchTopoComp(cParamExeBench & aParam); ///< Topo compensation
 
 // void cAppli_MMVII_Bench::Bench_0000_String(); => Bench on string-split
 void BenchSerialization(cParamExeBench & aParam,const std::string & aDirOut,const std::string & aDirIn); ///< Bench on seriaization function

MMVII/include/MMVII_enums.h

@@ -86,7 +86,7 @@ enum class eApF
                TiePLearn,    ///< Tie-Point processing  - Learning step
                Cloud,       ///< Cloud processing
                CodedTarget,  ///< Coded target (generate, match )
-               Topo,        ///< Topometry
+               Topo,        ///< Topo survey
                NoGui,        ///< Will not have a GUI frontend
                Perso,      ///< Personnal
                eNbVals     ///< Tag for number of value
@@ -545,15 +545,15 @@ enum class eSysCo
      eNbVals
 };
 
-// topometric observation sets types
+// topo observation sets types
 enum class eTopoObsSetType
 {
     eStation,
     //eDistParam,
     eNbVals        ///< Tag for number of value
 };
 
-// topometric observations types
+// topo observations types
 enum class eTopoObsType
 {
         eDist,

MMVII/src/SymbDerGen/Formulas_Geom3D.h

@@ -68,7 +68,7 @@ class cDist3DParam
      }
 };
 
-/**  Class for generating code relative topometric subframe observation */
+/**  Class for generating code relative topo subframe observation */
 class cTopoSubFrame
 {
   public :

MMVII/src/SymbDerGen/Formulas_Topo.h

@@ -6,7 +6,7 @@
 #include "ComonHeaderSymb.h"
 #include "MMVII_PhgrDist.h"
 
-/**  Class for generating topometric equations:
+/**  Class for generating topo survey equations:
  *
  *  The instrument frame is representated as a pose:
  *    Pose_instr = {Ci ; Ri}

MMVII/src/Topo/Topo.h

@@ -28,7 +28,7 @@ public :
 
     void  AddToSys(cSetInterUK_MultipeObj<tREAL8> &); // The system must be aware of all the unknowns
 
-    // fix the variable that are frozen
+    // fix the variables that are frozen
     void SetFrozenAndSharedVars(cResolSysNonLinear<tREAL8> &)  ;
 
     //  Do the kernel job : add topo constraints to the system

MMVII/src/Topo/ctopodata.h

@@ -93,7 +93,7 @@ enum class eCompCorType
 };
 
 /**
- * @brief The cTopoData class represents topometric data for serialization
+ * @brief The cTopoData class represents topo survey data for serialization
  */
 class cTopoData
 {