ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/rt/rpict.c
(Generate patch)

Comparing ray/src/rt/rpict.c (file contents):
Revision 2.88 by greg, Fri May 9 23:28:57 2014 UTC vs.
Revision 2.89 by greg, Tue Feb 24 19:39:27 2015 UTC

# Line 34 | Line 34 | static const char RCSid[] = "$Id$";
34   #include  "random.h"
35   #include  "paths.h"
36   #include  "hilbert.h"
37 + #include  "pmapbias.h"
38 + #include  "pmapdiag.h"
39  
38 –
40   #define  RFTEMPLATE     "rfXXXXXX"
41  
42   #ifndef SIGCONT
# Line 167 | Line 168 | int  code;
168   static void
169   report(int dummy)               /* report progress */
170   {
171 +        char                    bcStat [128];
172          double          u, s;
173   #ifdef BSD
174          struct rusage   rubuf;
# Line 192 | Line 194 | report(int dummy)              /* report progress */
194          s = ( tbuf.tms_stime + tbuf.tms_cstime ) * period;
195   #endif
196  
197 +        /* PMAP: Get photon map bias compensation statistics */
198 +        pmapBiasCompReport(bcStat);
199 +        
200          sprintf(errmsg,
201 <            "%lu rays, %4.2f%% after %.3fu %.3fs %.3fr hours on %s (PID %d)\n",
202 <                        nrays, pctdone, u*(1./3600.), s*(1./3600.),
201 >                        "%lu rays, %s %4.2f%% after %.3fu %.3fs %.3fr hours on %s (PID %d)\n",
202 >                        nrays, bcStat, pctdone, u*(1./3600.), s*(1./3600.),
203                          (tlastrept-tstart)*(1./3600.), myhostname(), getpid());
204          eputs(errmsg);
205   #ifdef SIGCONT
# Line 205 | Line 210 | report(int dummy)              /* report progress */
210   static void
211   report(int dummy)               /* report progress */
212   {
213 +        char    bcStat [128];
214 +        
215          tlastrept = time((time_t *)NULL);
216 <        sprintf(errmsg, "%lu rays, %4.2f%% after %5.4f hours\n",
217 <                        nrays, pctdone, (tlastrept-tstart)/3600.0);
216 >
217 >        /* PMAP: Get photon map bias compensation statistics */
218 >        pmapBiasCompReport(bcStat);
219 >        
220 >        sprintf(errmsg, "%lu rays, %s %4.2f%% after %5.4f hours\n",
221 >                        nrays, bcStat, pctdone, (tlastrept-tstart)/3600.0);
222          eputs(errmsg);
223   }
224   #endif

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines