Commit 42d1c46f authored by Jesse Mapel's avatar Jesse Mapel
Browse files

Updated control tests after removing target radii

parent e5bdacb8

isis/src/control/objs/ControlNet/ControlNet.cpp

+0 −9
Original line number Diff line number Diff line
@@ -1753,15 +1753,6 @@ namespace Isis { 
         || label.hasGroup("Mapping") ) {

      mapping = label.findGroup("Mapping", Pvl::Traverse);

    }

    // If radii values don't exist in the labels

    // or if they are set to null,

    // try to get target radii using the TargetName or NaifKeywords object values

    if (!mapping.hasKeyword("EquatorialRadius")

        || !mapping.hasKeyword("PolarRadius")) {



      mapping = Target::radiiGroup(label, mapping);



    }



    if (mapping.hasKeyword("TargetName")) {

      p_targetName = mapping["TargetName"][0];

isis/src/control/objs/ControlNet/ControlNet.truth

+2 −10
Original line number Diff line number Diff line
@@ -88,11 +88,9 @@ Set target/radii directly. Invalid radii. 


Set target/radii directly. Valid radii.

        TargetName = SomethingStrange

        TargetRadii = (3.14159, 1.5708, 2.71828)



Set target/radii using empty PVL.

        TargetName = 

        TargetRadii = (-1.79769e+308, -1.79769e+308, -1.79769e+308)



Set target/radii using PVL with no PolarRadius.

Group = Mapping
@@ -101,7 +99,6 @@ Group = Mapping 
End_Group

End

        TargetName = Mars

        TargetRadii = (3.39619e+06, 3.39619e+06, 3.3762e+06)



Set target/radii using PVL containing both radii.

Group = Mapping
@@ -111,15 +108,11 @@ Group = Mapping 
End_Group

End

        TargetName = Mars

        TargetRadii = (6, 6, 1)



Set empty target.

        TargetName = 

        TargetRadii = (-1.79769e+308, -1.79769e+308, -1.79769e+308)



Set Mars target.

        TargetName = Mars

        TargetRadii = (3.39619e+06, 3.39619e+06, 3.3762e+06)



Test adding control points with identical id numbers ...

**PROGRAMMER ERROR** ControlPoint must have unique Id.
@@ -147,7 +140,6 @@ Object = ControlNetwork 
  Created      = 2010-07-10T12:50:15

  LastModified = 2010-07-10T12:50:55

  Description  = "UnitTest of ControlNetwork"

  TargetRadii  = (3396190.0, 3396190.0, 3376200.0)

  Version      = 5



  Object = ControlPoint
@@ -170,7 +162,7 @@ Object = ControlNetwork 
    # AprioriRadius = 999.99999984142 <meters>

    AprioriZ                 = 529.919264 <meters>



    # AprioriLatitudeSigma = 97324.497783569 <meters>  AprioriLongitudeSigma = 124939.57715415 <meters>  AprioriRadiusSigma = 38.454887341483 <meters>

    # AprioriLatitudeSigma = 28.65696494252 <meters>  AprioriLongitudeSigma = 26.457513107566 <meters>  AprioriRadiusSigma = 38.454887341483 <meters>

    AprioriCovarianceMatrix  = (100.0, 0.0, 0.0, 2500.0, 0.0, 400.0)

    LatitudeConstrained      = True

    LongitudeConstrained     = True
@@ -185,7 +177,7 @@ Object = ControlNetwork 
    # AdjustedRadius = 999.99999984142 <meters>

    AdjustedZ                = 529.919264 <meters>



    # AdjustedLatitudeSigma = 97324.497783569 <meters>  AdjustedLongitudeSigma = 124939.57715415 <meters>  AdjustedRadiusSigma = 38.454887341483 <meters>

    # AdjustedLatitudeSigma = 28.65696494252 <meters>  AdjustedLongitudeSigma = 26.457513107566 <meters>  AdjustedRadiusSigma = 38.454887341483 <meters>

    AdjustedCovarianceMatrix = (100.0, 0.0, 0.0, 2500.0, 0.0, 400.0)



    Group = ControlMeasure

isis/src/control/objs/ControlNet/unitTest.cpp

+17 −42
Original line number Diff line number Diff line
@@ -308,22 +308,14 @@ int main() { 
  targetRadii += Distance(Isis::HALFPI, Distance::Meters);

  targetRadii += Distance(Isis::E, Distance::Meters);

  cn1.SetTarget("SomethingStrange", targetRadii);

  vector<Distance> targRad = cn1.GetTargetRadii();

  cout << "        TargetName = " << cn1.GetTarget() << endl;

  cout << "        TargetRadii = (" << targRad[0].meters() << ", " 

                                    << targRad[1].meters() << ", "

                                    << targRad[2].meters() << ")" << endl;

  cout << endl;

  cout << "Set target/radii using empty PVL." << endl;

  Pvl label;

  // no mapping group, (i.e. target name empty, no equatorial radius)

  // catch exception and set radii to nulls

  cn1.SetTarget(label);

  targRad = cn1.GetTargetRadii();

  cout << "        TargetName = " << cn1.GetTarget() << endl;

  cout << "        TargetRadii = (" << targRad[0].meters() << ", " 

                                    << targRad[1].meters() << ", "

                                    << targRad[2].meters() << ")" << endl;

  cout << endl;

  cout << "Set target/radii using PVL with no PolarRadius." << endl;

  label += PvlGroup("Mapping");
@@ -332,38 +324,21 @@ int main() { 
  mapping += PvlKeyword("EquatorialRadius", "");

  cout << label << endl;

  cn1.SetTarget(label);

  targRad = cn1.GetTargetRadii();

  cout << "        TargetName = " << cn1.GetTarget() << endl;

  cout << "        TargetRadii = (" << targRad[0].meters() << ", " 

                                    << targRad[1].meters() << ", "

                                    << targRad[2].meters() << ")" << endl;

  cout << endl;

  cout << "Set target/radii using PVL containing both radii." << endl;

  mapping.addKeyword(PvlKeyword("EquatorialRadius", "6.0"), PvlContainer::Replace);

  mapping.addKeyword(PvlKeyword("PolarRadius", "1.0"), PvlContainer::Replace);

  cout << label << endl;

  cn1.SetTarget(label);

  targRad = cn1.GetTargetRadii();

  cout << "        TargetName = " << cn1.GetTarget() << endl;

  cout << "        TargetRadii = (" << targRad[0].meters() << ", " 

                                    << targRad[1].meters() << ", "

                                    << targRad[2].meters() << ")" << endl;

  cout << endl;

  cout << "Set empty target." << endl;

  cn1.SetTarget("");

  targRad = cn1.GetTargetRadii();

  cout << "        TargetName = " << cn1.GetTarget() << endl;

  cout << "        TargetRadii = (" << targRad[0].meters() << ", " 

                                    << targRad[1].meters() << ", "

                                    << targRad[2].meters() << ")" << endl;

  cout << endl;

  cout << "Set Mars target." << endl;

  cn1.SetTarget("Mars");

  targRad = cn1.GetTargetRadii();

  cout << "        TargetName = " << cn1.GetTarget() << endl;

  cout << "        TargetRadii = (" << targRad[0].meters() << ", " 

                                    << targRad[1].meters() << ", "

                                    << targRad[2].meters() << ")" << endl;

  cout << endl;



  cn1.SetTarget("Mars");

isis/src/control/objs/ControlNetVersioner/ControlNetVersioner.truth

+8 −16
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ Object = ControlNetwork 
  Created      = Null

  LastModified = Null

  Description  = Null

  TargetRadii  = (3396190.0, 3396190.0, 3376200.0)

  Version      = 5



  Object = ControlPoint
@@ -77,7 +76,6 @@ Object = ControlNetwork 
  Created      = Null

  LastModified = Null

  Description  = "Test Network"

  TargetRadii  = (2575000.0, 2575000.0, 2575000.0)

  Version      = 5



  Object = ControlPoint
@@ -134,7 +132,6 @@ Object = ControlNetwork 
  Created      = 2010-07-10T12:50:15

  LastModified = 2010-07-10T12:50:55

  Description  = "UnitTest of ControlNetwork"

  TargetRadii  = (3396190.0, 3396190.0, 3376200.0)

  Version      = 5



  Object = ControlPoint
@@ -157,7 +154,7 @@ Object = ControlNetwork 
    # AprioriRadius = 999.99999984142 <meters>

    AprioriZ                 = 529.919264 <meters>



    # AprioriLatitudeSigma = 97324.497783569 <meters>  AprioriLongitudeSigma = 124939.57715415 <meters>  AprioriRadiusSigma = 38.454887341483 <meters>

    # AprioriLatitudeSigma = 28.65696494252 <meters>  AprioriLongitudeSigma = 26.457513107566 <meters>  AprioriRadiusSigma = 38.454887341483 <meters>

    AprioriCovarianceMatrix  = (100.0, 0.0, 0.0, 2500.0, 0.0, 400.0)

    LatitudeConstrained      = True

    LongitudeConstrained     = True
@@ -172,7 +169,7 @@ Object = ControlNetwork 
    # AdjustedRadius = 999.99999984142 <meters>

    AdjustedZ                = 529.919264 <meters>



    # AdjustedLatitudeSigma = 97324.497783569 <meters>  AdjustedLongitudeSigma = 124939.57715415 <meters>  AdjustedRadiusSigma = 38.454887341483 <meters>

    # AdjustedLatitudeSigma = 28.65696494252 <meters>  AdjustedLongitudeSigma = 26.457513107566 <meters>  AdjustedRadiusSigma = 38.454887341483 <meters>

    AdjustedCovarianceMatrix = (100.0, 0.0, 0.0, 2500.0, 0.0, 400.0)



    Group = ControlMeasure
@@ -319,7 +316,7 @@ Write the network and re-read it... 
After reading and writing to a binary form does Pvl match?

Reading/Writing control network is consistent



Reading: $control/testData/unitTest_ControlNetVersioner_PvlNetwork4_PvlV0003.pvl...

Reading: $control/testData/unitTest_ControlNetVersioner_PvlNetwork8_PvlV0005.pvl...



Read network...

Reading Control Points...
@@ -332,7 +329,6 @@ Object = ControlNetwork 
  Created      = 2012-01-04T12:09:57

  LastModified = 2012-01-04T12:09:57

  Description  = "Themis Day IR Network: Lunae Palus, Lat(0,30) Lon(270-315)"

  TargetRadii  = (3396190.0, 3396190.0, 3376200.0)

  Version      = 5



  Object = ControlPoint
@@ -361,7 +357,7 @@ Object = ControlNetwork 
    # AdjustedRadius = 3394325.2138031 <meters>

    AdjustedZ                = 829595.31268436 <meters>



    # AdjustedLatitudeSigma = 100.13842019954 <meters>  AdjustedLongitudeSigma = 106.48711145076 <meters>  AdjustedRadiusSigma = 0.099947528407384 <meters>

    # AdjustedLatitudeSigma = 100.08343601321 <meters>  AdjustedLongitudeSigma = 100.07117311087 <meters>  AdjustedRadiusSigma = 0.099947528407384 <meters>

    AdjustedCovarianceMatrix = (8096.6118516192, 3791.9236705506,

                                -1072.6708105639, 2516.0772474838,

                                2117.9301543094, 9418.2547424025)
@@ -457,7 +453,7 @@ Object = ControlNetwork 
    # AdjustedRadius = 3397378.3342506 <meters>

    AdjustedZ                = 93324.42152629 <meters>



    # AdjustedLatitudeSigma = 56.560713922924 <meters>  AdjustedLongitudeSigma = 56.546411110445 <meters>  AdjustedRadiusSigma = 0.099943774867249 <meters>

    # AdjustedLatitudeSigma = 56.58050463946 <meters>  AdjustedLongitudeSigma = 56.523513347564 <meters>  AdjustedRadiusSigma = 0.099943774867249 <meters>

    AdjustedCovarianceMatrix = (2621.8486551013, 1225.183985133,

                                -35.999329178353, 575.49833284641,

                                80.485341554024, 3198.9240672187)
@@ -563,12 +559,7 @@ After reading and writing to a binary form does Pvl match? 
Conversion to Pvl stays consistent

Reading/Writing control network is consistent

Check conversions between the binary format and the pvl format.

8c8,9

<   Version      = 3

---

>   TargetRadii  = (3396190.0, 3396190.0, 3376200.0)

>   Version      = 5

The conversion from pvl to binary is incorrect.

The conversion methods for pvl->bin and bin->pvl are correct.



Reading: $control/testData/unitTest_ControlNetVersioner_PvlNetwork5_PvlV0003.pvl...
@@ -585,7 +576,8 @@ Read network... 
Reading Control Points...

0% Processed
10% Processed
20% Processed
30% Processed
40% Processed
50% Processed
60% Processed
70% Processed
80% Processed
90% Processed
100% Processed

Write the network and re-read it...



After reading and writing to a binary form does Pvl match?

Reading/Writing control network is consistent



Reading: $control/testData/PvlNet_TestNetwork2_V3.net...

isis/src/control/objs/ControlNetVersioner/unitTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ int main(int argc, char *argv[]) { 
  TestNetwork("$control/testData/unitTest_ControlNetVersioner_ProtoNetwork1_ProtoV0001.net", testProgress); // Binary V1

  TestNetwork("$control/testData/unitTest_ControlNetVersioner_BadNetwork_ProtoV0001.net", testProgress);    // Corrupted (based off of oldNetwork2.net)

  TestNetwork("$control/testData/unitTest_ControlNetVersioner_ProtoNetwork2_ProtoV0002.net", testProgress, false);  // Binary V2

  TestNetwork("$control/testData/unitTest_ControlNetVersioner_PvlNetwork4_PvlV0003.pvl", testProgress, true, true); // Network with rejected jigsaw points

  TestNetwork("$control/testData/unitTest_ControlNetVersioner_PvlNetwork8_PvlV0005.pvl", testProgress, true, true); // Network with rejected jigsaw points

  TestNetwork("$control/testData/unitTest_ControlNetVersioner_PvlNetwork5_PvlV0003.pvl", testProgress, false, false); // Network full of weird test cases (based on PvlNetwork4)

  TestNetwork("$control/testData/PvlNet_TestNetwork1_V2.net", testProgress, false, false); // Test Network 1 created for code coverage.

  TestNetwork("$control/testData/PvlNet_TestNetwork2_V3.net", testProgress, false, false); // Test Network 2 created for code coverage.