Commit d1d0a347 authored by Ken Edmundson's avatar Ken Edmundson
Browse files

bugs after fixing merge conflicts

parent b0ac3b96
Loading
Loading
Loading
Loading
+6 −6
Original line number Diff line number Diff line
@@ -882,6 +882,11 @@ namespace Isis {
      double vtpv = 0.0;
      double previousSigma0 = 0.0;
      
      // Set up formatting for status updates with doubles (e.g. Sigma0, Elapsed Time)
      int fieldWidth = 20;
      char format = 'f';
      int precision = 10;
      
      // start the clock
      clock_t solveStartClock = clock();

@@ -997,11 +1002,6 @@ namespace Isis {
        // (also called variance of unit weight, reference variance, variance factor, etc.)
        m_bundleResults.computeSigma0(vtpv, m_bundleSettings->convergenceCriteria());

        // Set up formatting for status updates with doubles (e.g. Sigma0, Elapsed Time)
        int fieldWidth = 20;
        char format = 'f';
        int precision = 10;

        emit statusUpdate(QString("Iteration: %1 \n")
                                  .arg(m_iteration));
        emit statusUpdate(QString("Sigma0: %1 \n")