|
4310 | 4310 |
|
4311 | 4311 | (define (calculate-optimal-encoding proc exports host-config ribn-base) |
4312 | 4312 | (let* ((symtbl-and-symbols* (encode-symtbl proc exports host-config 20)) ;; we assume 20 shorts, will be re-evaluated |
4313 | | - (raw-stream (encode-program proc (car symtbl-and-symbols*) 'raw #t (ribn-base))) |
| 4313 | + (raw-stream (encode-program proc (car symtbl-and-symbols*) 'raw #t ribn-base)) |
4314 | 4314 | (stats (get-stat-from-raw ($make-table) raw-stream)) |
4315 | 4315 | (encoding |
4316 | 4316 | (calculate-start |
|
4319 | 4319 | (get-maximal-encoding |
4320 | 4320 | (map car encoding-skip-92) |
4321 | 4321 | stats |
4322 | | - (ribn-base) |
| 4322 | + ribn-base |
4323 | 4323 | ;;DEBUG encoding calculation -- Add the following to |
4324 | 4324 | ;;verify the optimal encoding calculations |
4325 | 4325 | ;; |
|
4332 | 4332 | ;; (encoding-table->encoding-list |
4333 | 4333 | ;; solution))) |
4334 | 4334 | ;; #t |
4335 | | - ;; (ribn-base))) |
| 4335 | + ;; ribn-base)) |
4336 | 4336 | )))))) |
4337 | 4337 | encoding)) |
4338 | 4338 |
|
|
4382 | 4382 | (eqv? (ribn-base) 92)) |
4383 | 4383 | encoding-skip-92) |
4384 | 4384 | ((string=? "optimal" encoding-name) |
4385 | | - (calculate-optimal-encoding proc exports host-config ribn-base)) |
| 4385 | + (calculate-optimal-encoding proc exports host-config (ribn-base))) |
4386 | 4386 | (else |
4387 | 4387 | (error "Cannot find encoding (or number of byte not supported) :" encoding-name)))) |
4388 | 4388 |
|
|
4408 | 4408 | (if (and compression/2b? (eqv? byte-base 92)) |
4409 | 4409 | (begin |
4410 | 4410 | (set! compression-range-size compression-range-size-min) |
4411 | | - (set! encoding (calculate-optimal-encoding proc exports host-config ribn-base)) |
| 4411 | + (set! encoding (calculate-optimal-encoding proc exports host-config (ribn-base))) |
4412 | 4412 |
|
4413 | 4413 | (let* ((symtbl-and-symbols* |
4414 | 4414 | (encode-symtbl |
|
4458 | 4458 | (begin |
4459 | 4459 | (let ((new-crs(+ crs 2) )) |
4460 | 4460 | (set! compression-range-size new-crs) |
4461 | | - (set! encoding (calculate-optimal-encoding proc exports host-config ribn-base)) |
| 4461 | + (set! encoding (calculate-optimal-encoding proc exports host-config (ribn-base))) |
4462 | 4462 | (let* ((symtbl-and-symbols* |
4463 | 4463 | (encode-symtbl |
4464 | 4464 | proc |
|
4529 | 4529 | (if (and compression/2b? (eqv? byte-base 256)) |
4530 | 4530 | (begin |
4531 | 4531 | (set! compression-range-size compression-range-size-min) |
4532 | | - (set! encoding (calculate-optimal-encoding proc exports host-config ribn-base)) |
| 4532 | + (set! encoding (calculate-optimal-encoding proc exports host-config (ribn-base))) |
4533 | 4533 |
|
4534 | 4534 | (let* ((symtbl-and-symbols* |
4535 | 4535 | (encode-symtbl |
|
4579 | 4579 | (begin |
4580 | 4580 | (let ((new-crs(+ crs 2) )) |
4581 | 4581 | (set! compression-range-size new-crs) |
4582 | | - (set! encoding (calculate-optimal-encoding proc exports host-config ribn-base)) |
| 4582 | + (set! encoding (calculate-optimal-encoding proc exports host-config (ribn-base))) |
4583 | 4583 | (let* ((symtbl-and-symbols* |
4584 | 4584 | (encode-symtbl |
4585 | 4585 | proc |
|
0 commit comments