ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/rt/RcontribSimulManager.cpp
(Generate patch)

Comparing ray/src/rt/RcontribSimulManager.cpp (file contents):
Revision 2.14 by greg, Fri Oct 17 01:15:53 2025 UTC vs.
Revision 2.16 by greg, Thu Oct 23 01:26:48 2025 UTC

# Line 54 | Line 54 | struct RowAssignment {
54  
55   static const char       ROW_DONE[] = "ROW FINISHED\n";
56  
57 < // Get format identifier
58 < const char *
59 < formstr(int f)
60 < {
61 <        switch (f) {
62 <        case 'a': return("ascii");
63 <        case 'f': return("float");
64 <        case 'd': return("double");
65 <        case 'c': return(NCSAMP==3 ? COLRFMT : SPECFMT);
66 <        }
67 <        return("unknown");
68 < }
69 <
70 < // Our default data share function
71 < RdataShare *
72 < defDataShare(const char *name, RCOutputOp op, size_t siz)
73 < {
74 <        return new RdataShareMap(name, RSDOflags[op], siz);
75 < }
76 <
77 < // Allocate rcontrib accumulator
78 < RcontribMod *
57 > // allocate rcontrib accumulator
58 > static RcontribMod *
59   NewRcMod(const char *prms, const char *binexpr, int ncbins)
60   {
61 +        if (binexpr && !*binexpr) binexpr = NULL;
62          if (!prms) prms = "";
63          if ((ncbins > 1) & !binexpr) {
64                  error(USER, "missing bin expression");
# Line 112 | Line 93 | NewRcMod(const char *prms, const char *binexpr, int nc
93          return mp;
94   }
95  
96 < // Free an RcontribMod
96 > // Free an RcontribMod (public for RcontribSimulManager constructor)
97   void
98   FreeRcMod(void *p)
99   {
# Line 120 | Line 101 | FreeRcMod(void *p)
101          EPNODE *        bep = (*(RcontribMod *)p).binv;
102          if (bep) epfree(bep, true);
103          efree(p);
104 + }
105 +
106 + // Get format identifier
107 + const char *
108 + formstr(int f)
109 + {
110 +        switch (f) {
111 +        case 'a': return("ascii");
112 +        case 'f': return("float");
113 +        case 'd': return("double");
114 +        case 'c': return(NCSAMP==3 ? COLRFMT : SPECFMT);
115 +        }
116 +        return("unknown");
117 + }
118 +
119 + // Our default data share function
120 + RdataShare *
121 + defDataShare(const char *name, RCOutputOp op, size_t siz)
122 + {
123 +        return new RdataShareMap(name, RSDOflags[op], siz);
124   }
125  
126   // Set output format ('f', 'd', or 'c')

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)