Added ReconstructError.cc and .h and made necessary changes to other …

…files for support.
harguess · Aug 16, 2010 · d493f3d · d493f3d
1 parent 5c48c33
commit d493f3d
Show file tree

Hide file tree

Showing 6 changed files with 312 additions and 287 deletions.
diff --git a/src/vw/Photometry.h b/src/vw/Photometry.h
@@ -19,6 +19,7 @@
 #include <vw/Photometry/Misc.h>
 #include <vw/Photometry/Outlier.h>
 #include <vw/Photometry/Reconstruct.h>
+#include <vw/Photometry/ReconstructError.h>
 #include <vw/Photometry/Reflectance.h>
 #include <vw/Photometry/Shadow.h>
 #include <vw/Photometry/Shape.h>

diff --git a/src/vw/Photometry/Albedo.cc b/src/vw/Photometry/Albedo.cc
diff --git a/src/vw/Photometry/Albedo.h b/src/vw/Photometry/Albedo.h
@@ -39,11 +39,12 @@ namespace photometry {
                           std::vector<ModelParams> overlap_img_params,
                           GlobalParams globalParams);
 
+  //josh - moved to ReconstructError.h
   //reconstruction error functions
-  void ComputeReconstructionErrorMap(ModelParams input_img_params,
-                                     std::vector<ModelParams> overlap_img_params,
-                                     GlobalParams globalParams,
-                                     float *avgError, int *totalNumSamples);
+//  void ComputeReconstructionErrorMap(ModelParams input_img_params,
+//                                     std::vector<ModelParams> overlap_img_params,
+//                                     GlobalParams globalParams,
+//                                     float *avgError, int *totalNumSamples);
 
 }} // end vw::photometry
 

diff --git a/src/vw/Photometry/Exposure.cc b/src/vw/Photometry/Exposure.cc
@@ -11,6 +11,7 @@ using namespace vw::cartography;
 
 #include <vw/Photometry/Reflectance.h>
 #include <vw/Photometry/Reconstruct.h>
+#include <vw/Photometry/ReconstructError.h>
 #include <vw/Photometry/Misc.h>
 #include <vw/Photometry/Weights.h>
 #include <vw/Photometry/Exposure.h>
@@ -37,22 +38,23 @@ float ComputeGradient_Exposure(float T, float albedo) {
   return grad;
 }
 
-//Ara Nefian
-float ComputeError_Exposure(float intensity, float T,
-                            float albedo, float reflectance,
-                            Vector3 /*xyz*/,
-                            Vector3 /*xyz_prior*/) {
-  float error;
-  error = (intensity-T*albedo*reflectance);
-  return error;
-}
-
-float ComputeError_Exposure(float intensity, float T,
-                            float albedo, float reflectance) {
-  float error;
-  error = (intensity-T*albedo*reflectance);
-  return error;
-}
+//josh - moved to ReconstructError.cc and renamed to ComputeError
+////Ara Nefian
+//float ComputeError_Exposure(float intensity, float T,
+//                            float albedo, float reflectance,
+//                            Vector3 /*xyz*/,
+//                            Vector3 /*xyz_prior*/) {
+//  float error;
+//  error = (intensity-T*albedo*reflectance);
+//  return error;
+//}
+//
+//float ComputeError_Exposure(float intensity, float T,
+//                            float albedo, float reflectance) {
+//  float error;
+//  error = (intensity-T*albedo*reflectance);
+//  return error;
+//}
 
 //void AppendExposureInfoToFile(string exposureFilename, string currInputFile, ModelParams currModelParams)
 void vw::photometry::AppendExposureInfoToFile(std::string exposureFilename,
@@ -117,8 +119,10 @@ void vw::photometry::ComputeExposure(ModelParams *currModelParams,
       if ( is_valid(curr_image(l,k)) ) {
 
         currReflectance = 1;
-        float error = ComputeError_Exposure((float)curr_image(l,k), currModelParams->exposureTime,
+        float error = ComputeError((float)curr_image(l,k), currModelParams->exposureTime,
                                             (float)curr_albedo(l,k), currReflectance);
+//        float error = ComputeError_Exposure((float)curr_image(l,k), currModelParams->exposureTime,
+//                                            (float)curr_albedo(l,k), currReflectance);
         float gradient = ComputeGradient_Exposure( (float)curr_albedo(l,k), currReflectance);
 
         delta_nominator = delta_nominator + error*gradient;
@@ -201,8 +205,10 @@ void vw::photometry::ComputeExposureAlbedo(ModelParams *currModelParams,
             Vector3 normal = computeNormalFrom3DPointsGeneral(xyz, xyz_left, xyz_top);
 
             currReflectance = ComputeReflectance(normal, xyz, *currModelParams, globalParams);
-            float error = ComputeError_Exposure((float)curr_image(l,k), currModelParams->exposureTime,
-                                                (float)curr_albedo(l,k), currReflectance, xyz, xyz);
+            float error = ComputeError((float)curr_image(l,k), currModelParams->exposureTime,
+                                                (float)curr_albedo(l,k), currReflectance);
+//            float error = ComputeError_Exposure((float)curr_image(l,k), currModelParams->exposureTime,
+//                                                (float)curr_albedo(l,k), currReflectance, xyz, xyz);
 
             float gradient = ComputeGradient_Exposure(currModelParams->exposureTime, (float)curr_albedo(l,k));
 

diff --git a/src/vw/Photometry/Makefile.am b/src/vw/Photometry/Makefile.am
@@ -12,12 +12,12 @@
 if MAKE_MODULE_PHOTOMETRY
 
 include_HEADERS = Albedo.h Camres.h Exposure.h Index.h Misc.h Outlier.h   \
-                  Reconstruct.h Reflectance.h Shadow.h ShapeFromShading.h \
-                  Shape.h Weights.h
+                  Reconstruct.h ReconstructError.h Reflectance.h Shadow.h \
+                  ShapeFromShading.h Shape.h Weights.h
 
 libvwPhotometry_la_SOURCES = Albedo.cc Camres.cc Exposure.cc Index.cc Misc.cc \
                   Outlier.cc Reflectance.cc Shadow.cc Shape.cc                \
-                  ShapeFromShading.cc Weights.cc Reconstruct.cc
+                  ShapeFromShading.cc Weights.cc Reconstruct.cc ReconstructError.cc
 
 lib_LTLIBRARIES = libvwPhotometry.la
 

diff --git a/src/vw/Photometry/ShapeFromShading.cc b/src/vw/Photometry/ShapeFromShading.cc
@@ -32,6 +32,7 @@ using namespace vw::cartography;
 
 #include <math.h>
 #include <vw/Photometry/Reconstruct.h>
+#include <vw/Photometry/ReconstructError.h>
 #include <vw/Photometry/ShapeFromShading.h>
 using namespace vw::photometry;
 
@@ -41,7 +42,7 @@ using namespace vw::photometry;
 //#define VER_BLOCK_SIZE 16 //8 //4
 #define numJacobianRows (horBlockSize+1)*(verBlockSize+1)
 #define numJacobianCols (horBlockSize*verBlockSize)
-#define Unique "round1test"
+#define Unique "round2test"
 
 //enum LossType { GAUSSIAN, CAUCHY, EXPONENTIAL };
 //double LOSS_ACCURACY_MULT = 1;
@@ -151,13 +152,14 @@ float ComputeReliefDerivative(Vector3 xyz,Vector3 xyzLEFT,Vector3 xyzTOP, Vector
   return reliefDeriv;
 }
 
-float ComputeReconstructError(float intensity, float T, float albedo,
-                              float reflectance) {
-  float error;
-  error = (intensity-T*albedo*reflectance); /*+ (xyz_prior[2]-xyz_prior[2]);*/
-  //std::cout << "intensity " << intensity << " albedo " << albedo << " T " << T << " reflectance " << reflectance << " error "<< error << std::endl;
-  return error;
-}
+//josh - moved to ReconstructError.cc and name changed to ComputeError
+//float ComputeReconstructError(float intensity, float T, float albedo,
+//                              float reflectance) {
+//  float error;
+//  error = (intensity-T*albedo*reflectance); /*+ (xyz_prior[2]-xyz_prior[2]);*/
+//  //std::cout << "intensity " << intensity << " albedo " << albedo << " T " << T << " reflectance " << reflectance << " error "<< error << std::endl;
+//  return error;
+//}
 
 
 
@@ -308,7 +310,8 @@ ComputeBlockJacobian(ImageViewBase<ViewT1> const& inputImage, GeoReference const
 
               //compute the reconstruction errors
 	      float relief = ComputeReflectance(normalize(normalArray[r]), xyzArray[r], inputImgParams, globalParams);
-	      float recErr = ComputeReconstructError((float)inputImage.impl()(jj, ii), inputImgParams.exposureTime, (float)albedoImage.impl()(jj, ii), relief);					
+      	      float recErr = ComputeError((float)inputImage.impl()(jj, ii), inputImgParams.exposureTime, (float)albedoImage.impl()(jj, ii), relief);					
+//              float recErr = ComputeReconstructError((float)inputImage.impl()(jj, ii), inputImgParams.exposureTime, (float)albedoImage.impl()(jj, ii), relief);
 	      errorVectorArray(r) = recErr*weight;
               //printf("%d %f\n", r, errorVectorArray(r));
 
@@ -403,7 +406,8 @@ ComputeBlockJacobianOverlap(ImageViewBase<ViewT1> const& inputImage, GeoReferenc
 
               //compute the errors
 	      float relief = ComputeReflectance(normalize(normalArray[r]), xyzArray[r], overlapImgParams, globalParams);
-	      float recErr = ComputeReconstructError((float)interpOverlapImage.impl()(x, y), overlapImgParams.exposureTime, (float)albedoImage.impl()(jj, ii), relief);					
+      	      float recErr = ComputeError((float)interpOverlapImage.impl()(x, y), overlapImgParams.exposureTime, (float)albedoImage.impl()(jj, ii), relief);
+//              float recErr = ComputeReconstructError((float)interpOverlapImage.impl()(x, y), overlapImgParams.exposureTime, (float)albedoImage.impl()(jj, ii), relief);
 	      errorVectorArray(r) = recErr*weight;
 
 	  }