Start cleaning up Quantum

This commit is contained in:
Matt Nadareski
2024-12-11 08:00:41 -05:00
parent 24afbb3003
commit 0e7aebde54

View File

@@ -20,47 +20,47 @@ namespace SabreTools.Compression.Quantum
/// <summary>
/// Selector 0: literal, 64 entries, starting symbol 0
/// </summary>
private Model _model0;
private readonly Model _model0;
/// <summary>
/// Selector 1: literal, 64 entries, starting symbol 64
/// </summary>
private Model _model1;
private readonly Model _model1;
/// <summary>
/// Selector 2: literal, 64 entries, starting symbol 128
/// </summary>
private Model _model2;
private readonly Model _model2;
/// <summary>
/// Selector 3: literal, 64 entries, starting symbol 192
/// </summary>
private Model _model3;
private readonly Model _model3;
/// <summary>
/// Selector 4: LZ, 3 character matches
/// </summary>
private Model _model4;
private readonly Model _model4;
/// <summary>
/// Selector 5: LZ, 4 character matches
/// </summary>
private Model _model5;
private readonly Model _model5;
/// <summary>
/// Selector 6: LZ, 5+ character matches
/// </summary>
private Model _model6;
private readonly Model _model6;
/// <summary>
/// Selector 6 length model
/// </summary>
private Model _model6len;
private readonly Model _model6len;
/// <summary>
/// Selector selector model
/// </summary>
private Model _selector;
private readonly Model _selector;
#endregion
@@ -105,25 +105,25 @@ namespace SabreTools.Compression.Quantum
_bitStream = new ReadOnlyBitStream(ms);
// Initialize literal models
this._model0 = CreateModel(0, 64);
this._model1 = CreateModel(64, 64);
this._model2 = CreateModel(128, 64);
this._model3 = CreateModel(192, 64);
_model0 = CreateModel(0, 64);
_model1 = CreateModel(64, 64);
_model2 = CreateModel(128, 64);
_model3 = CreateModel(192, 64);
// Initialize LZ models
int maxBitLength = (int)(windowBits * 2);
this._model4 = CreateModel(0, maxBitLength > 24 ? 24 : maxBitLength);
this._model5 = CreateModel(0, maxBitLength > 36 ? 36 : maxBitLength);
this._model6 = CreateModel(0, maxBitLength);
this._model6len = CreateModel(0, 27);
_model4 = CreateModel(0, maxBitLength > 24 ? 24 : maxBitLength);
_model5 = CreateModel(0, maxBitLength > 36 ? 36 : maxBitLength);
_model6 = CreateModel(0, maxBitLength);
_model6len = CreateModel(0, 27);
// Initialze the selector model
this._selector = CreateModel(0, 7);
_selector = CreateModel(0, 7);
// Initialize coding state
this.CS_H = 0;
this.CS_L = 0;
this.CS_C = 0;
CS_H = 0;
CS_L = 0;
CS_C = 0;
}
/// <summary>
@@ -145,25 +145,25 @@ namespace SabreTools.Compression.Quantum
_bitStream = new ReadOnlyBitStream(input);
// Initialize literal models
this._model0 = CreateModel(0, 64);
this._model1 = CreateModel(64, 64);
this._model2 = CreateModel(128, 64);
this._model3 = CreateModel(192, 64);
_model0 = CreateModel(0, 64);
_model1 = CreateModel(64, 64);
_model2 = CreateModel(128, 64);
_model3 = CreateModel(192, 64);
// Initialize LZ models
int maxBitLength = (int)(windowBits * 2);
this._model4 = CreateModel(0, maxBitLength > 24 ? 24 : maxBitLength);
this._model5 = CreateModel(0, maxBitLength > 36 ? 36 : maxBitLength);
this._model6 = CreateModel(0, maxBitLength);
this._model6len = CreateModel(0, 27);
_model4 = CreateModel(0, maxBitLength > 24 ? 24 : maxBitLength);
_model5 = CreateModel(0, maxBitLength > 36 ? 36 : maxBitLength);
_model6 = CreateModel(0, maxBitLength);
_model6len = CreateModel(0, 27);
// Initialze the selector model
this._selector = CreateModel(0, 7);
_selector = CreateModel(0, 7);
// Initialize coding state
this.CS_H = 0;
this.CS_L = 0;
this.CS_C = 0;
CS_H = 0;
CS_L = 0;
CS_C = 0;
}
/// <summary>