Skip to content

Commit eb6b4d9

Browse files
vidanovicvidanovic
committed
Version of DirectDiffuse that compiles but still not using dirdif functions
1 parent 8c18333 commit eb6b4d9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+1778
-1778
lines changed

‎test/cma.unit.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ TEST_F(TestCMA, Test_CMA_Single_Vision)
6363

6464
auto results =
6565
wincalc::calc_cma(*cma_window, glazing_system_u, glazing_system_shgc, tvis, spacer_keff);
66-
EXPECT_NEAR(results.u, 1.451714, 1e-6);
66+
EXPECT_NEAR(results.u, 1.451730, 1e-6);
6767
EXPECT_NEAR(results.shgc, 0.299620, 1e-6);
6868
EXPECT_NEAR(results.vt, 0.468371, 1e-6);
6969
}
@@ -94,7 +94,7 @@ TEST_F(TestCMA, Test_CMA_Double_Vision_Vertical)
9494
auto results =
9595
wincalc::calc_cma(*cma_window, glazing_system_u, glazing_system_shgc, tvis, spacer_keff);
9696

97-
EXPECT_NEAR(results.u, 1.511768, 1e-6);
97+
EXPECT_NEAR(results.u, 1.511791, 1e-6);
9898
EXPECT_NEAR(results.shgc, 0.290800, 1e-6);
9999
EXPECT_NEAR(results.vt, 0.454171, 1e-6);
100100
}
@@ -125,7 +125,7 @@ TEST_F(TestCMA, Test_CMA_Double_Vision_Horizontal)
125125
auto results =
126126
wincalc::calc_cma(*cma_window, glazing_system_u, glazing_system_shgc, tvis, spacer_keff);
127127

128-
EXPECT_NEAR(results.u, 1.512250, 1e-6);
128+
EXPECT_NEAR(results.u, 1.512273, 1e-6);
129129
EXPECT_NEAR(results.shgc, 0.290802, 1e-6);
130130
EXPECT_NEAR(results.vt, 0.454171, 1e-6);
131131
}

‎test/expected_results/1_layer/cgdb_31017/default/condensed_spectrum/theta=0_phi=0/color.json‎

Lines changed: 108 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@
44
"reflectance": {
55
"diffuse_diffuse": {
66
"lab": {
7-
"L": 56.45362261667326,
8-
"a": -1.3287715503307873,
9-
"b": -2.5739815824628476
7+
"L": 28.523561352696007,
8+
"a": 0.38056986654871894,
9+
"b": 0.38517993514964877
1010
},
1111
"rgb": {
12-
"B": 174,
13-
"G": 148,
14-
"R": 145
12+
"B": 84,
13+
"G": 72,
14+
"R": 76
1515
},
1616
"trichromatic": {
17-
"X": 24.06539874246297,
18-
"Y": 24.367240312572484,
19-
"Z": 35.60630365674049
17+
"X": 5.690086583411141,
18+
"Y": 5.654519662421044,
19+
"Z": 7.65577666024687
2020
}
2121
},
2222
"direct_diffuse": {
@@ -38,55 +38,55 @@
3838
},
3939
"direct_direct": {
4040
"lab": {
41-
"L": 50.553679435379095,
42-
"a": -1.7143499969536902,
43-
"b": -3.290382731760455
41+
"L": 24.88768087683851,
42+
"a": -0.0003686469534081027,
43+
"b": -0.21629231307697117
4444
},
4545
"rgb": {
46-
"B": 157,
47-
"G": 132,
48-
"R": 127
46+
"B": 75,
47+
"G": 63,
48+
"R": 65
4949
},
5050
"trichromatic": {
51-
"X": 18.55559165191714,
52-
"Y": 18.886098219202793,
53-
"Z": 28.256875372069445
51+
"X": 4.380692616612861,
52+
"Y": 4.3792875990413656,
53+
"Z": 6.0749431305659485
5454
}
5555
},
5656
"direct_hemispheric": {
5757
"lab": {
58-
"L": 50.553679435379095,
59-
"a": -1.7143499969536902,
60-
"b": -3.290382731760455
58+
"L": 24.88768087683851,
59+
"a": -0.0003686469534081027,
60+
"b": -0.21629231307697117
6161
},
6262
"rgb": {
63-
"B": 157,
64-
"G": 132,
65-
"R": 127
63+
"B": 75,
64+
"G": 63,
65+
"R": 65
6666
},
6767
"trichromatic": {
68-
"X": 18.55559165191714,
69-
"Y": 18.886098219202793,
70-
"Z": 28.256875372069445
68+
"X": 4.380692616612861,
69+
"Y": 4.3792875990413656,
70+
"Z": 6.0749431305659485
7171
}
7272
}
7373
},
7474
"transmittance": {
7575
"diffuse_diffuse": {
7676
"lab": {
77-
"L": 83.32660228399018,
78-
"a": -0.5163139820493767,
79-
"b": 2.212780558936589
77+
"L": 11.169946594802326,
78+
"a": 1.1145217922796102,
79+
"b": 5.153362698022263
8080
},
8181
"rgb": {
82-
"B": 253,
83-
"G": 225,
84-
"R": 232
82+
"B": 28,
83+
"G": 29,
84+
"R": 37
8585
},
8686
"trichromatic": {
87-
"X": 62.57381358447224,
88-
"Y": 62.780211013606014,
89-
"Z": 82.98999791403037
87+
"X": 1.3224369874370132,
88+
"Y": 1.2849682195774597,
89+
"Z": 1.2450764754297898
9090
}
9191
},
9292
"direct_diffuse": {
@@ -108,36 +108,36 @@
108108
},
109109
"direct_direct": {
110110
"lab": {
111-
"L": 86.73962676178625,
112-
"a": -0.5340534549305165,
113-
"b": 2.2888133137738853
111+
"L": 12.103550389317846,
112+
"a": 1.1528191809669215,
113+
"b": 5.330439883875465
114114
},
115115
"rgb": {
116-
"B": 255,
117-
"G": 236,
118-
"R": 243
116+
"B": 30,
117+
"G": 31,
118+
"R": 40
119119
},
120120
"trichromatic": {
121-
"X": 69.24841570744739,
122-
"Y": 69.47682816219219,
123-
"Z": 91.842348558204
121+
"X": 1.463498245619073,
122+
"Y": 1.4220327511503859,
123+
"Z": 1.3778859237701004
124124
}
125125
},
126126
"direct_hemispheric": {
127127
"lab": {
128-
"L": 86.73962676178625,
129-
"a": -0.5340534549305165,
130-
"b": 2.2888133137738853
128+
"L": 12.103550389317846,
129+
"a": 1.1528191809669215,
130+
"b": 5.330439883875465
131131
},
132132
"rgb": {
133-
"B": 255,
134-
"G": 236,
135-
"R": 243
133+
"B": 30,
134+
"G": 31,
135+
"R": 40
136136
},
137137
"trichromatic": {
138-
"X": 69.24841570744739,
139-
"Y": 69.47682816219219,
140-
"Z": 91.842348558204
138+
"X": 1.463498245619073,
139+
"Y": 1.4220327511503859,
140+
"Z": 1.3778859237701004
141141
}
142142
}
143143
}
@@ -146,19 +146,19 @@
146146
"reflectance": {
147147
"diffuse_diffuse": {
148148
"lab": {
149-
"L": 56.50280750253914,
150-
"a": -1.4498836042703411,
151-
"b": -2.534955709933162
149+
"L": 28.701648443502535,
150+
"a": 0.35263535559657,
151+
"b": 0.3017998985639925
152152
},
153153
"rgb": {
154-
"B": 174,
155-
"G": 148,
156-
"R": 145
154+
"B": 85,
155+
"G": 73,
156+
"R": 76
157157
},
158158
"trichromatic": {
159-
"X": 24.08650666231405,
160-
"Y": 24.41689885296883,
161-
"Z": 35.64466985927299
159+
"X": 5.756002843431985,
160+
"Y": 5.722642929435221,
161+
"Z": 7.773779069518663
162162
}
163163
},
164164
"direct_diffuse": {
@@ -180,55 +180,55 @@
180180
},
181181
"direct_direct": {
182182
"lab": {
183-
"L": 50.617030889964084,
184-
"a": -1.869921897181992,
185-
"b": -3.2392029358788044
183+
"L": 25.062311701893165,
184+
"a": -0.053592968850768585,
185+
"b": -0.28615811381875744
186186
},
187187
"rgb": {
188-
"B": 157,
189-
"G": 132,
190-
"R": 126
188+
"B": 75,
189+
"G": 64,
190+
"R": 65
191191
},
192192
"trichromatic": {
193-
"X": 18.57853793767561,
194-
"Y": 18.940081758172187,
195-
"Z": 28.298582988263124
193+
"X": 4.4330607970594,
194+
"Y": 4.435639256722778,
195+
"Z": 6.171052169425168
196196
}
197197
},
198198
"direct_hemispheric": {
199199
"lab": {
200-
"L": 50.617030889964084,
201-
"a": -1.869921897181992,
202-
"b": -3.2392029358788044
200+
"L": 25.062311701893165,
201+
"a": -0.053592968850768585,
202+
"b": -0.28615811381875744
203203
},
204204
"rgb": {
205-
"B": 157,
206-
"G": 132,
207-
"R": 126
205+
"B": 75,
206+
"G": 64,
207+
"R": 65
208208
},
209209
"trichromatic": {
210-
"X": 18.57853793767561,
211-
"Y": 18.940081758172187,
212-
"Z": 28.298582988263124
210+
"X": 4.4330607970594,
211+
"Y": 4.435639256722778,
212+
"Z": 6.171052169425168
213213
}
214214
}
215215
},
216216
"transmittance": {
217217
"diffuse_diffuse": {
218218
"lab": {
219-
"L": 83.32660228399018,
220-
"a": -0.5163139820493767,
221-
"b": 2.212780558936589
219+
"L": 11.169946594802326,
220+
"a": 1.1145217922796102,
221+
"b": 5.153362698022263
222222
},
223223
"rgb": {
224-
"B": 253,
225-
"G": 225,
226-
"R": 232
224+
"B": 28,
225+
"G": 29,
226+
"R": 37
227227
},
228228
"trichromatic": {
229-
"X": 62.57381358447224,
230-
"Y": 62.780211013606014,
231-
"Z": 82.98999791403037
229+
"X": 1.3224369874370132,
230+
"Y": 1.2849682195774597,
231+
"Z": 1.2450764754297898
232232
}
233233
},
234234
"direct_diffuse": {
@@ -250,36 +250,36 @@
250250
},
251251
"direct_direct": {
252252
"lab": {
253-
"L": 86.73962676178625,
254-
"a": -0.5340534549305165,
255-
"b": 2.2888133137738853
253+
"L": 12.103550389317846,
254+
"a": 1.1528191809669215,
255+
"b": 5.330439883875465
256256
},
257257
"rgb": {
258-
"B": 255,
259-
"G": 236,
260-
"R": 243
258+
"B": 30,
259+
"G": 31,
260+
"R": 40
261261
},
262262
"trichromatic": {
263-
"X": 69.24841570744739,
264-
"Y": 69.47682816219219,
265-
"Z": 91.842348558204
263+
"X": 1.463498245619073,
264+
"Y": 1.4220327511503859,
265+
"Z": 1.3778859237701004
266266
}
267267
},
268268
"direct_hemispheric": {
269269
"lab": {
270-
"L": 86.73962676178625,
271-
"a": -0.5340534549305165,
272-
"b": 2.2888133137738853
270+
"L": 12.103550389317846,
271+
"a": 1.1528191809669215,
272+
"b": 5.330439883875465
273273
},
274274
"rgb": {
275-
"B": 255,
276-
"G": 236,
277-
"R": 243
275+
"B": 30,
276+
"G": 31,
277+
"R": 40
278278
},
279279
"trichromatic": {
280-
"X": 69.24841570744739,
281-
"Y": 69.47682816219219,
282-
"Z": 91.842348558204
280+
"X": 1.463498245619073,
281+
"Y": 1.4220327511503859,
282+
"Z": 1.3778859237701004
283283
}
284284
}
285285
}

0 commit comments

Comments
 (0)