diff --git a/MMVII/include/MMVII_Topo.h b/MMVII/include/MMVII_Topo.h index 8494aa1589..020809474b 100644 --- a/MMVII/include/MMVII_Topo.h +++ b/MMVII/include/MMVII_Topo.h @@ -26,7 +26,7 @@ class cBA_Topo : public cMemCheck { friend class cTopoData; public : - cBA_Topo(cPhotogrammetricProject *aPhProj, cMMVII_BundleAdj *aBA); + cBA_Topo(cPhotogrammetricProject *aPhProj); ~cBA_Topo(); void clear(); @@ -50,7 +50,7 @@ public : bool tryInitAll(); bool tryInit(cTopoPoint & aTopoPt, tStationsMap & stationsMap, tSimpleObsMap &allSimpleObs); - bool mergeUnknowns(cResolSysNonLinear &aSys); //< if several stations share origin etc. + bool mergeUnknowns(); //< if several stations share origin etc. void makeConstraints(cResolSysNonLinear &aSys); const std::map & getAllPts() const { return mAllPts; } std::map & getAllPts() { return mAllPts; } diff --git a/MMVII/src/BundleAdjustment/cMMVII_BundleAdj.cpp b/MMVII/src/BundleAdjustment/cMMVII_BundleAdj.cpp index 054d6adec7..144cc19ca2 100644 --- a/MMVII/src/BundleAdjustment/cMMVII_BundleAdj.cpp +++ b/MMVII/src/BundleAdjustment/cMMVII_BundleAdj.cpp @@ -709,7 +709,7 @@ void cMMVII_BundleAdj::SaveTopo() void cMMVII_BundleAdj::AddTopo() // TOPO { - mTopo = new cBA_Topo(mPhProj, this); + mTopo = new cBA_Topo(mPhProj); } }; // MMVII diff --git a/MMVII/src/Topo/Topo.cpp b/MMVII/src/Topo/Topo.cpp index ae6268b44b..5fccc34107 100644 --- a/MMVII/src/Topo/Topo.cpp +++ b/MMVII/src/Topo/Topo.cpp @@ -19,7 +19,7 @@ void cMMVII_BundleAdj::InitItereTopo() cBA_Topo::cBA_Topo -(cPhotogrammetricProject *aPhProj, cMMVII_BundleAdj* aBA) : +(cPhotogrammetricProject *aPhProj) : mPhProj (aPhProj), mTopoObsType2equation { @@ -82,7 +82,7 @@ void cBA_Topo::findPtsUnknowns(const std::vector & vGCP, cPhotogrammet { for (auto & [aName, aTopoPt] : getAllPts()) { - aTopoPt.findUK(vGCP, aPhProj, aTopoPt.getInitCoord()); + aTopoPt.findUK(vGCP, aPhProj); } } @@ -236,7 +236,7 @@ void cBA_Topo::AddToSys(cSetInterUK_MultipeObj & aSetInterUK) aSetInterUK.AddOneObj(anObsSet); } -bool cBA_Topo::mergeUnknowns(cResolSysNonLinear &aSys) +bool cBA_Topo::mergeUnknowns() { bool ok = true; for (auto &set: mAllObsSets) @@ -291,7 +291,7 @@ const cTopoPoint & cBA_Topo::getPoint(std::string name) const void cBA_Topo::SetFrozenAndSharedVars(cResolSysNonLinear & aSys) { // create unknowns for all stations - mergeUnknowns(aSys); // + mergeUnknowns(); // makeConstraints(aSys); } diff --git a/MMVII/src/Topo/ctopopoint.cpp b/MMVII/src/Topo/ctopopoint.cpp index 5c2b908546..716280c15c 100644 --- a/MMVII/src/Topo/ctopopoint.cpp +++ b/MMVII/src/Topo/ctopopoint.cpp @@ -12,12 +12,6 @@ cTopoPoint::cTopoPoint(const std::string &name) : { } -cTopoPoint::cTopoPoint(const std::string & name, const cPt3dr &aInitCoord, bool aIsFree, const cPt3dr &aSigmas) : - mName(name), mInitCoord(aInitCoord), - mVertDefl(std::nullopt), mUK(nullptr), mPt(nullptr) -{ -} - cTopoPoint::cTopoPoint() : mName(""), mInitCoord(cPt3dr::Dummy()), mVertDefl(std::nullopt), @@ -26,7 +20,7 @@ cTopoPoint::cTopoPoint() : } -void cTopoPoint::findUK(const std::vector & vGCP, cPhotogrammetricProject *aPhProj, const cPt3dr & aCoordIfPureTopo) +void cTopoPoint::findUK(const std::vector & vGCP, cPhotogrammetricProject *aPhProj) { #ifdef VERBOSE_TOPO StdOut() << "findUK "< &vGCP, cPhotogrammetricProject *aPhProj, const cPt3dr &aCoordIfPureTopo); //< all params can be null + void findUK(const std::vector &vGCP, cPhotogrammetricProject *aPhProj); //< all params can be null cPt3dr* getPt() const; cObjWithUnkowns* getUK() const; bool isReady() const { return mUK!=nullptr; } //< ready after findOrMakeUK. Can't use in equations if not ready