Skip to content

Commit 1d60dad

Browse files
bengsigbengsig
committed
Final trigonometry stuff
1 parent 30f6db1 commit 1d60dad

File tree

7 files changed

+20
-6
lines changed

7 files changed

+20
-6
lines changed

‎admin/.vim/syntax/rwl.vim‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ syn keyword rwlKeyword getenv system opensessioncount activesessioncount serverr
2323
syn keyword rwlKeyword unsigned hexadecimal octal printf fprintf encode decode elseif
2424
syn keyword rwlKeyword connectionpool connectionclass sprintf global querynotification
2525
syn keyword rwlKeyword normalrandom statisticsonly ceil trunc floor
26-
syn keyword rwlKeyword lobprefetch readlob writelob
26+
syn keyword rwlKeyword lobprefetch readlob writelob atan2
2727
syn keyword rwlKeyword getrusage instr instrb regexextract nextgroup=rwlNumber skipwhite
2828

2929
syn match rwlVariable "\$#"
@@ -113,6 +113,8 @@ syn match rwlDirective '\$reconnect1017:off'
113113
syn match rwlDirective '\$pre31fileassign:warn'
114114
syn match rwlDirective '\$pre31fileassign:on'
115115
syn match rwlDirective '\$pre31fileassign:off'
116+
syn match rwlDirective '\$trigonometry:radians'
117+
syn match rwlDirective '\$trigonometry:degrees'
116118
syn match rwlDirective '\$niceabort:on'
117119
syn match rwlDirective '\$niceabort:off'
118120
syn match rwlDirective '\$queue:on'

‎man/man1rwl/directive.1rwl‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -496,6 +496,14 @@ The directive is only available in a start-up file such as ~/.rwloadsim.rwl.
496496
Refer to useroption(1rwl).
497497
.RE
498498
.P
499+
.B $trigonometry:radians
500+
.br
501+
.B $trigonometry:degrees
502+
.RS 4
503+
By default, the trigonometry functions, sin, cos, and atan2 use degrees.
504+
You can change this to radians using the former of these two directives.
505+
.RE
506+
.P
499507
.B $include
500508
.RS 4
501509
Refer to include(1rwl).

‎man/man1rwl/expression.1rwl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ function ::=
1515
\fBuniform\fR \fB(\fR expression \fB,\fR expression \fB)\fR
1616
| ( \fBerlang\fR | \fBerlang2\fR ) \fB(\fR expression \fB)\fR
1717
| \fBerlangk\fR \fB(\fR expression \fB,\fR expression \fB)\fR
18-
| \fBnormalrandom\fR \fB(\fR expression \fB,\fR expression \fB)\fR
19-
| ( \fBsqrt\fR | \fBround\fR | \fBceil\fR | \fBfloor\fR | \fBtrunc\fR ) \fB(\fR expression \fB)\fR
18+
| ( \fBatan2\fR | \fBnormalrandom\fR ) \fB(\fR expression \fB,\fR expression \fB)\fR
19+
| ( \fBsin\fR | \fBcos\fR | \fBsqrt\fR | \fBround\fR | \fBceil\fR | \fBfloor\fR | \fBtrunc\fR ) \fB(\fR expression \fB)\fR
2020
| ( \fBexp\fR | \fBlog\fR ) \fB(\fR [ expression \fB,\fR) ] expression \fB)\fR
2121
| \fBlengthb\fR \fB(\fR concatenation \fB)\fR
2222
| \fBinstrb\fR \fB(\fR concatenation \fB,\fR concatenation [ \fB,\fR expression ] \fB)\fR

‎src/rwl.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@
1313
*
1414
* History
1515
*
16+
* bengsig 9-nov-2023 - Increase RWL_MAX_VAR
1617
* johnkenn 02-nov-2023 - trignometry sin, cos, atan2
17-
* bengsig 9-nov-2023 - Increase RWL_MAX_VAR
18-
* johnkenn 02-nov-2023 - trignometry sin, cos, atan2
1918
* bengsig 3-oct-2023 - Now development for 3.1.1
2019
* bengsig 2-oct-2023 - Releasing 3.1.0
2120
* bengsig 22-sep-2023 - ampersand fixes

‎test/test.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ then
4747
testlist="$*"
4848
else
4949
# note that 323..326 test CQN which we don't currently compile in
50-
testlist='1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 363 364'
50+
testlist='1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364'
5151
fi
5252

5353
diffokcount=0;

‎test/testres/362.err.good‎

Whitespace-only changes.

‎test/testres/362.out.good‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
0.02 -0.01 135.00
2+
0.02 -0.01 135.00
3+
0.88 -0.48 2.36
4+
0.02 -0.01 135.00
5+
0.88 -0.48 2.36

0 commit comments

Comments
 (0)