Commit d5e1abc0 authored by Jeannie Backer's avatar Jeannie Backer
Browse files

Merged remaining base directory changes from v006LibrariesV2 to ipce. 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/branches/ipce@7138 41f8697f-d340-4b68-9986-7bafba869bb8
parent b029921b

isis/src/base/objs/Albedo/Albedo.cpp

+2 −3
Original line number Diff line number Diff line
@@ -2,9 +2,7 @@ 
#include "SpecialPixel.h"

#include "IException.h"

#include "IString.h"



#define MIN(x,y) (((x) < (y)) ? (x) : (y))

#define MAX(x,y) (((x) > (y)) ? (x) : (y))

#include "NormModel.h"



namespace Isis {

  Albedo::Albedo(Pvl &pvl, PhotoModel &pmodel) : NormModel(pvl, pmodel) {
@@ -50,6 +48,7 @@ namespace Isis { 
    GetPhotoModel()->SetStandardConditions(false);

  }





  void Albedo::NormModelAlgorithm(double phase, double incidence,

                                  double emission, double demincidence, double dememission,

                                  double dn, double &albedo, double &mult, double &base) {

isis/src/base/objs/Angle/Angle.truth

+5 −5
Original line number Diff line number Diff line
@@ -39,13 +39,13 @@ Testing logical operators 
  angle1 <  (angle1 + epsilon)?  0

  angle2 >  (angle2 - epsilon)?  0

  angle1 <= angle2?  1

**PROGRAMMER ERROR** Cannot compare a invalid angles with the < operator.

**PROGRAMMER ERROR** Cannot compare a invalid angles with the < operator.

**PROGRAMMER ERROR** Cannot compare a invalid angles with the < operator.

  angle1 <  angle2?  **PROGRAMMER ERROR** Cannot compare a invalid angles with the < operator.

  angle1 <  angle2?  **PROGRAMMER ERROR** Cannot compare a invalid angles with the < operator.

  angle1 <=  angle2?  **PROGRAMMER ERROR** Cannot compare a invalid angles with the < operator.

  angle1 >  angle2?  0

**PROGRAMMER ERROR** Cannot compare a invalid angles with the > operator.

  angle1 >  angle2?  **PROGRAMMER ERROR** Cannot compare a invalid angles with the > operator.

  angle1 >= angle2?  0

**PROGRAMMER ERROR** Cannot compare a invalid angles with the > operator.

  angle1 >= angle2?  **PROGRAMMER ERROR** Cannot compare a invalid angles with the > operator.



Testing protected methods

  Degree wrap value = 360

isis/src/base/objs/Angle/unitTest.cpp

+28 −24
Original line number Diff line number Diff line
@@ -176,7 +176,8 @@ int main(int argc, char *argv[]) { 
  try {

    Angle angle1(30., Angle::Degrees );

    Angle angle2(45., Angle::Degrees);

    cerr << "  angle1 <  angle2?  " << (angle1 < angle2) << endl;

    cerr << "  angle1 <  angle2?  ";

    cerr << (angle1 < angle2) << endl;

  }

  catch(Isis::IException &e) {

    e.print();
@@ -187,7 +188,8 @@ int main(int argc, char *argv[]) { 
    Angle angle2(45., Angle::Degrees);

    //Angle epsilon((double)numeric_limits<float>::epsilon(), Angle::Degrees);//1.1920929e-07

    Angle epsilon(1.1920929e-12, Angle::Degrees);//1.1920929e-07

    cerr << "  angle1 <  (angle1 + epsilon)?  " << (angle1 < angle1 + epsilon) << endl;

    cerr << "  angle1 <  (angle1 + epsilon)?  ";

    cerr << (angle1 < angle1 + epsilon) << endl;

  }

  catch(Isis::IException &e) {

    e.print();
@@ -197,7 +199,8 @@ int main(int argc, char *argv[]) { 
    Angle angle1(30., Angle::Degrees );

    Angle angle2(45., Angle::Degrees);

    Angle epsilon(1.1920929e-12, Angle::Degrees);

    cerr << "  angle2 >  (angle2 - epsilon)?  " << (angle2 > angle2 - epsilon) << endl;

    cerr << "  angle2 >  (angle2 - epsilon)?  ";

    cerr << (angle2 > angle2 - epsilon) << endl;

  }

  catch(Isis::IException &e) {

    e.print();
@@ -206,7 +209,8 @@ int main(int argc, char *argv[]) { 
  try {

    Angle angle1(30., Angle::Degrees );

    Angle angle2(45., Angle::Degrees);

    cerr << "  angle1 <= angle2?  " << (angle1 <= angle2) << endl;

    cerr << "  angle1 <= angle2?  ";

    cerr << (angle1 <= angle2) << endl;

  }

  catch(Isis::IException &e) {

    e.print();
@@ -214,7 +218,8 @@ int main(int argc, char *argv[]) { 


  try {

    Angle angle1(30., Angle::Degrees );

    cerr << "  angle1 <  angle2?  " << (angle1 < Angle());

    cout << "  angle1 <  angle2?  ";

    cerr << (angle1 < Angle());

  }

  catch(Isis::IException &e) {

    e.print();
@@ -222,7 +227,8 @@ int main(int argc, char *argv[]) { 


  try {

    Angle angle1(30., Angle::Degrees );

    cerr << "  angle1 <  angle2?  " << (Angle() < angle1);

    cout << "  angle1 <  angle2?  ";

    cerr  << (Angle() < angle1);

  }

  catch(Isis::IException &e) {

    e.print();
@@ -230,7 +236,8 @@ int main(int argc, char *argv[]) { 


  try {

    Angle angle1(30., Angle::Degrees );

    cerr << "  angle1 <=  angle2?  " << (Angle() <= angle1);

    cerr << "  angle1 <=  angle2?  ";

    cerr << (Angle() <= angle1);

  }

  catch(Isis::IException &e) {

    e.print();
@@ -239,7 +246,8 @@ int main(int argc, char *argv[]) { 
  try {

    Angle angle1(30., Angle::Degrees );

    Angle angle2(45., Angle::Degrees);

    cerr << "  angle1 >  angle2?  " << (angle1 > angle2) << endl;

    cerr << "  angle1 >  angle2?  ";

    cerr << (angle1 > angle2) << endl;

  }

  catch(Isis::IException &e) {

    e.print();
@@ -247,7 +255,8 @@ int main(int argc, char *argv[]) { 


  try {

    Angle angle1(30., Angle::Degrees );

    cerr << "  angle1 >  angle2?  " << (angle1 > Angle()) << endl;

    cerr << "  angle1 >  angle2?  ";

    cerr << (angle1 > Angle()) << endl;

  }

  catch(Isis::IException &e) {

    e.print();
@@ -256,7 +265,8 @@ int main(int argc, char *argv[]) { 
  try {

    Angle angle1(30., Angle::Degrees );

    Angle angle2(45., Angle::Degrees);

    cerr << "  angle1 >= angle2?  " << (angle1 >= angle2) << endl;

    cerr << "  angle1 >= angle2?  ";

    cerr << (angle1 >= angle2) << endl;

  }

  catch(Isis::IException &e) {

    e.print();
@@ -264,7 +274,8 @@ int main(int argc, char *argv[]) { 


  try {

    Angle angle1(30., Angle::Degrees );

    cerr << "  angle1 >= angle2?  " << (angle1 >= Angle()) << endl;

    cerr << "  angle1 >= angle2?  ";

    cerr << (angle1 >= Angle()) << endl;

  }

  catch(Isis::IException &e) {

    e.print();
@@ -348,10 +359,3 @@ int main(int argc, char *argv[]) { 
  }



}

isis/src/base/objs/Application/Application.cpp

+1 −3
Original line number Diff line number Diff line
@@ -549,7 +549,6 @@ namespace Isis { 
   * to the terminal or showing the log in the gui.

   */

  void Application::FunctionCleanup() {

    CubeManager::CleanUp();



    SessionLog::TheLog().Write();
@@ -1035,4 +1034,3 @@ namespace Isis { 
    return results;

  }

}  //end namespace isis

isis/src/base/objs/AtmosModel/AtmosModel.cpp

+1 −1
Original line number Diff line number Diff line
@@ -383,7 +383,7 @@ namespace Isis { 
    euler = 0.5772156649;



    nm1 = n - 1;

    if(n < 0 || x < 0.0 || (x == 0.0 && (n == 0 || n == 1))) {

    if((x < 0.0) || (x == 0.0 && (n == 0 || n == 1))) {

      IString msg = "AtmosModel::En() - Invalid arguments. ";

      msg += "Definition requires (x > 0.0 and n >=0 ) or (x >= 0.0 and n > 1). ";

      msg += "Entered x = " + IString(x) + " and n = " + IString((int) n);