simplified

vogechri · Apr 11, 2015 · d037906 · d037906
1 parent 4d1c790
commit d037906
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/SceneFlowCode/VCSF_CODE/ProjectProposals/ProjectSegmentation.h b/SceneFlowCode/VCSF_CODE/ProjectProposals/ProjectSegmentation.h
@@ -116,8 +116,6 @@ void ProjectSegmentation( int nlhs, mxArray *plhs[], int nrhs, const mxArray *pr
   M           = (size_t) mxGetM(prhs[13]);
   N           = (size_t) mxGetN(prhs[13]);
 
-  printf("View: %d\n", view);
-
   int nNormals = max( mxGetM(prhs[ 7]), mxGetN(prhs[ 7]) );
   int nStep    = min( mxGetM(prhs[ 7]), mxGetN(prhs[ 7]) );
   int nSegments  = (int) (mxGetM(prhs[15]) * mxGetN(prhs[15]));
@@ -132,6 +130,7 @@ void ProjectSegmentation( int nlhs, mxArray *plhs[], int nrhs, const mxArray *pr
     memset(output, 0, sizeof(Scalar) * nSegments2);
   }
 
+  printf("Project Proposals View: %d ", view);
   printf ("nSegments %d, nNormals %d \n", nSegments, nNormals);
   ///////////////////////////////////////////////////////
 

diff --git a/SceneFlowCode/VCSF_CODE/ProjectProposals/linearMotionProposals.h b/SceneFlowCode/VCSF_CODE/ProjectProposals/linearMotionProposals.h
@@ -83,7 +83,7 @@ void generateLinearMotionProposals( int nlhs, mxArray *plhs[], int nrhs, const m
   int nSegments_t1 = (int) max( mxGetM(edges), mxGetN(edges) );
   int nSegments_t0 = (int) max( mxGetM(prhs[ 4]), mxGetN(prhs[ 4]) );
 
-  printf ("nSegments t0-%d t1-%d, nNormals %d \n", nSegments_t0, nSegments_t1, nNormals);
+  printf ("Project proposals: Segments t0-%d t1-%d, nNormals %d \n", nSegments_t0, nSegments_t1, nNormals);
 
   ///////////////////////////////////////////////////////
   std::vector<int> currentSolution( nSegments_t0, 0 );
@@ -100,7 +100,7 @@ void generateLinearMotionProposals( int nlhs, mxArray *plhs[], int nrhs, const m
 
   enStore.flipNormals();// ?
 
-  std::clock_t startP(std::clock());
+//  std::clock_t startP(std::clock());
 
   linearMotionProposals<Scalar> LMH( nSegments_t0, nNormals, (int) N, (int) M );
 
@@ -132,8 +132,8 @@ void generateLinearMotionProposals( int nlhs, mxArray *plhs[], int nrhs, const m
   std::vector<linearMotionProposals<Scalar>::P3> newTranslations = LMH.getNewTra();
   std::vector<linearMotionProposals<Scalar>::M3> newRotations    = LMH.getNewRot();
 #endif
-  std::clock_t stopP(std::clock());
-  printf("Preprocess took %f\n", double(stopP-startP)/CLOCKS_PER_SEC );
+//  std::clock_t stopP(std::clock());
+//  printf("Preprocess took %f\n", double(stopP-startP)/CLOCKS_PER_SEC );
 
   /////////////////////////////////////////////////////////////////////////
   /////////////////////////////////////////////////////////////////////////

diff --git a/solvePWRSMulti/pwrsf/pwrsf_v4.m b/solvePWRSMulti/pwrsf/pwrsf_v4.m
@@ -21,7 +21,7 @@
 doVideoProposals = par.usePrevProps; % without use3Frames: add proposals do 2Frame
 useThreeFrames   = par.use3Frames;
 
-fprintf('\n\n\n s%.0f, j%.0f, e%.0f  fromProps:%d \n\n\n', par.doSeg, par.doJit, par.doEgo, fromProposals);
+fprintf('\n s%.0f, j%.0f, e%.0f  fromProps:%d \n', par.doSeg, par.doJit, par.doEgo, fromProposals);
 
 colors = 0;       % segments colors constant
 temp = find(isnan(N_prop) | isinf(N_prop) );