summaryrefslogtreecommitdiff
path: root/tools/lz/merging.c
diff options
context:
space:
mode:
Diffstat (limited to 'tools/lz/merging.c')
-rw-r--r--tools/lz/merging.c43
1 files changed, 42 insertions, 1 deletions
diff --git a/tools/lz/merging.c b/tools/lz/merging.c
index def572b1..79abb6d2 100644
--- a/tools/lz/merging.c
+++ b/tools/lz/merging.c
@@ -1,8 +1,47 @@
#include "proto.h"
-struct command * select_command_sequence (struct command ** sequences, const unsigned short * lengths, unsigned count, unsigned short * final_length) {
+struct command * select_optimal_sequence (struct command ** sequences, const unsigned short * lengths, unsigned short * final_length) {
+ struct command * compressor_sequences[NUM_COMPRESSORS * 2];
+ unsigned short compressor_lengths[NUM_COMPRESSORS * 2];
+ struct command * inverted_sequences[COMPRESSION_METHODS];
+ unsigned short inverted_lengths[COMPRESSION_METHODS];
+ unsigned p, current, method = 0;
+ for (current = 0; current < NUM_COMPRESSORS; current ++) {
+ compressor_sequences[current] = select_command_sequence(sequences + method, lengths + method, compressors[current].methods, compressor_lengths + current);
+ compressor_sequences[current + NUM_COMPRESSORS] = select_command_sequence(sequences + method, lengths + method, -(int) compressors[current].methods,
+ compressor_lengths + (current + NUM_COMPRESSORS));
+ for (p = 0; p < compressors[current].methods; p ++) {
+ inverted_sequences[method + compressors[current].methods - 1 - p] = sequences[method + p];
+ inverted_lengths[method + compressors[current].methods - 1 - p] = lengths[method + p];
+ }
+ method += compressors[current].methods;
+ }
+ unsigned short final_lengths[8];
+ struct command * final_sequences[8] = {
+ select_command_sequence(compressor_sequences, compressor_lengths, NUM_COMPRESSORS, final_lengths),
+ select_command_sequence(compressor_sequences, compressor_lengths, -NUM_COMPRESSORS, final_lengths + 1),
+ select_command_sequence(compressor_sequences + NUM_COMPRESSORS, compressor_lengths + NUM_COMPRESSORS, NUM_COMPRESSORS, final_lengths + 2),
+ select_command_sequence(compressor_sequences + NUM_COMPRESSORS, compressor_lengths + NUM_COMPRESSORS, -NUM_COMPRESSORS, final_lengths + 3),
+ select_command_sequence(sequences, lengths, COMPRESSION_METHODS, final_lengths + 4),
+ select_command_sequence(sequences, lengths, -COMPRESSION_METHODS, final_lengths + 5),
+ select_command_sequence(inverted_sequences, inverted_lengths, COMPRESSION_METHODS, final_lengths + 6),
+ select_command_sequence(inverted_sequences, inverted_lengths, -COMPRESSION_METHODS, final_lengths + 7)
+ };
+ for (current = 0; current < (2 * NUM_COMPRESSORS); current ++) free(compressor_sequences[current]);
+ struct command * result = select_command_sequence(final_sequences, final_lengths, 8, final_length);
+ for (current = 0; current < 8; current ++) free(final_sequences[current]);
+ return result;
+}
+
+struct command * select_command_sequence (struct command ** sequences, const unsigned short * lengths, int count, unsigned short * final_length) {
+ // negative count indicates iterating backwards
unsigned short min_sequence = 0, min_length = compressed_length(*sequences, *lengths);
unsigned short seq, len;
+ int backwards = 0;
+ if (count < 0) {
+ backwards = 1;
+ count = -count;
+ }
for (seq = 1; seq < count; seq ++) {
len = compressed_length(sequences[seq], lengths[seq]);
if (len < min_length) {
@@ -15,7 +54,9 @@ struct command * select_command_sequence (struct command ** sequences, const uns
memcpy(current, sequences[min_sequence], *final_length * sizeof(struct command));
struct command * new;
for (seq = 1; seq < count; seq ++) {
+ if (backwards) seq = count - seq;
new = merge_command_sequences(current, *final_length, sequences[(seq + min_sequence) % count], lengths[(seq + min_sequence) % count], final_length);
+ if (backwards) seq = count - seq; // restore the value for the loop
free(current);
current = new;
}