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.15 by greg, Fri Oct 17 17:43:53 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 (!prms) prms = "";
# Line 112 | Line 92 | NewRcMod(const char *prms, const char *binexpr, int nc
92          return mp;
93   }
94  
95 < // Free an RcontribMod
95 > // Free an RcontribMod (public for RcontribSimulManager constructor)
96   void
97   FreeRcMod(void *p)
98   {
# Line 120 | Line 100 | FreeRcMod(void *p)
100          EPNODE *        bep = (*(RcontribMod *)p).binv;
101          if (bep) epfree(bep, true);
102          efree(p);
103 + }
104 +
105 + // Get format identifier
106 + const char *
107 + formstr(int f)
108 + {
109 +        switch (f) {
110 +        case 'a': return("ascii");
111 +        case 'f': return("float");
112 +        case 'd': return("double");
113 +        case 'c': return(NCSAMP==3 ? COLRFMT : SPECFMT);
114 +        }
115 +        return("unknown");
116 + }
117 +
118 + // Our default data share function
119 + RdataShare *
120 + defDataShare(const char *name, RCOutputOp op, size_t siz)
121 + {
122 +        return new RdataShareMap(name, RSDOflags[op], siz);
123   }
124  
125   // Set output format ('f', 'd', or 'c')

Diff Legend

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