Skip to content

Commit

Permalink
add new table
Browse files Browse the repository at this point in the history
  • Loading branch information
Mozquito authored and Mozquito committed Oct 30, 2023
1 parent 87ef155 commit adf8719
Show file tree
Hide file tree
Showing 2 changed files with 137 additions and 48 deletions.
127 changes: 79 additions & 48 deletions src/plotting/Compression.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,45 +74,45 @@ CompressionInfo GetCompressionInfoForLevel( const uint32 compressionLevel )

switch ( compressionLevel )
{
case 1: return CreateCompressionCTable<1>( outTableSize, compress );
case 2: return CreateCompressionCTable<2>( outTableSize, compress );
case 3: return CreateCompressionCTable<3>( outTableSize, compress );
case 4: return CreateCompressionCTable<4>( outTableSize, compress );
case 5: return CreateCompressionCTable<5>( outTableSize, compress );
case 6: return CreateCompressionCTable<6>( outTableSize, compress );
case 7: return CreateCompressionCTable<7>( outTableSize, compress );
case 8: return CreateCompressionCTable<8>( outTableSize, compress );
case 9: return CreateCompressionCTable<9>( outTableSize, compress );
case 10: return CreateCompressionCTable<10>( outTableSize, compress );
case 11: return CreateCompressionCTable<11>( outTableSize, compress );
case 12: return CreateCompressionCTable<12>( outTableSize, compress );
case 13: return CreateCompressionCTable<13>( outTableSize, compress );
case 14: return CreateCompressionCTable<14>( outTableSize, compress );
case 15: return CreateCompressionCTable<15>( outTableSize, compress );
case 16: return CreateCompressionCTable<16>( outTableSize, compress );
case 17: return CreateCompressionCTable<17>( outTableSize, compress );
case 18: return CreateCompressionCTable<18>( outTableSize, compress );
case 19: return CreateCompressionCTable<19>( outTableSize, compress );
case 20: return CreateCompressionCTable<20>( outTableSize, compress );
case 21: return CreateCompressionCTable<21>( outTableSize, compress );
case 22: return CreateCompressionCTable<22>( outTableSize, compress );
case 23: return CreateCompressionCTable<23>( outTableSize, compress );
case 24: return CreateCompressionCTable<24>( outTableSize, compress );
case 25: return CreateCompressionCTable<25>( outTableSize, compress );
case 26: return CreateCompressionCTable<26>( outTableSize, compress );
case 27: return CreateCompressionCTable<27>( outTableSize, compress );
case 28: return CreateCompressionCTable<28>( outTableSize, compress );
case 29: return CreateCompressionCTable<29>( outTableSize, compress );
case 30: return CreateCompressionCTable<30>( outTableSize, compress );
case 31: return CreateCompressionCTable<31>( outTableSize, compress );
case 32: return CreateCompressionCTable<32>( outTableSize, compress );
case 33: return CreateCompressionCTable<33>( outTableSize, compress );
case 34: return CreateCompressionCTable<34>( outTableSize, compress );
case 35: return CreateCompressionCTable<35>( outTableSize, compress );
case 36: return CreateCompressionCTable<36>( outTableSize, compress );
case 37: return CreateCompressionCTable<37>( outTableSize, compress );
case 38: return CreateCompressionCTable<38>( outTableSize, compress );
case 39: return CreateCompressionCTable<39>( outTableSize, compress );
case 1: return GetCompressionInfoForLevel<1>( info ); break;
case 2: return GetCompressionInfoForLevel<2>( info ); break;
case 3: return GetCompressionInfoForLevel<3>( info ); break;
case 4: return GetCompressionInfoForLevel<4>( info ); break;
case 5: return GetCompressionInfoForLevel<5>( info ); break;
case 6: return GetCompressionInfoForLevel<6>( info ); break;
case 7: return GetCompressionInfoForLevel<7>( info ); break;
case 8: return GetCompressionInfoForLevel<8>( info ); break;
case 9: return GetCompressionInfoForLevel<9>( info ); break;
case 10: return GetCompressionInfoForLevel<10>( info ); break;
case 11: return GetCompressionInfoForLevel<11>( info ); break;
case 12: return GetCompressionInfoForLevel<12>( info ); break;
case 13: return GetCompressionInfoForLevel<13>( info ); break;
case 14: return GetCompressionInfoForLevel<14>( info ); break;
case 15: return GetCompressionInfoForLevel<15>( info ); break;
case 16: return GetCompressionInfoForLevel<16>( info ); break;
case 17: return GetCompressionInfoForLevel<17>( info ); break;
case 18: return GetCompressionInfoForLevel<18>( info ); break;
case 19: return GetCompressionInfoForLevel<19>( info ); break;
case 20: return GetCompressionInfoForLevel<20>( info ); break;
case 21: return GetCompressionInfoForLevel<21>( info ); break;
case 22: return GetCompressionInfoForLevel<22>( info ); break;
case 23: return GetCompressionInfoForLevel<23>( info ); break;
case 24: return GetCompressionInfoForLevel<24>( info ); break;
case 25: return GetCompressionInfoForLevel<25>( info ); break;
case 26: return GetCompressionInfoForLevel<26>( info ); break;
case 27: return GetCompressionInfoForLevel<27>( info ); break;
case 28: return GetCompressionInfoForLevel<28>( info ); break;
case 29: return GetCompressionInfoForLevel<29>( info ); break;
case 30: return GetCompressionInfoForLevel<30>( info ); break;
case 31: return GetCompressionInfoForLevel<31>( info ); break;
case 32: return GetCompressionInfoForLevel<32>( info ); break;
case 33: return GetCompressionInfoForLevel<33>( info ); break;
case 34: return GetCompressionInfoForLevel<34>( info ); break;
case 35: return GetCompressionInfoForLevel<35>( info ); break;
case 36: return GetCompressionInfoForLevel<36>( info ); break;
case 37: return GetCompressionInfoForLevel<37>( info ); break;
case 38: return GetCompressionInfoForLevel<38>( info ); break;
case 39: return GetCompressionInfoForLevel<39>( info ); break;
default:
Fatal( "Invalid compression level %u.", compressionLevel );
break;
Expand Down Expand Up @@ -206,14 +206,45 @@ uint32 GetCompressedLPBitCount( const uint32 compressionLevel )
size_t GetLargestCompressedParkSize()
{
return std::max( {
GetCompressionInfoForLevel( 1 ).tableParkSize,
GetCompressionInfoForLevel( 2 ).tableParkSize,
GetCompressionInfoForLevel( 3 ).tableParkSize,
GetCompressionInfoForLevel( 4 ).tableParkSize,
GetCompressionInfoForLevel( 5 ).tableParkSize,
GetCompressionInfoForLevel( 6 ).tableParkSize,
GetCompressionInfoForLevel( 7 ).tableParkSize,
GetCompressionInfoForLevel( 8 ).tableParkSize,
GetCompressionInfoForLevel( 9 ).tableParkSize }
GetCompressionInfoForLevel( 1 ).tableParkSize,
GetCompressionInfoForLevel( 2 ).tableParkSize,
GetCompressionInfoForLevel( 3 ).tableParkSize,
GetCompressionInfoForLevel( 4 ).tableParkSize,
GetCompressionInfoForLevel( 5 ).tableParkSize,
GetCompressionInfoForLevel( 6 ).tableParkSize,
GetCompressionInfoForLevel( 7 ).tableParkSize,
GetCompressionInfoForLevel( 8 ).tableParkSize,
GetCompressionInfoForLevel( 9 ).tableParkSize,
GetCompressionInfoForLevel( 10 ).tableParkSize,
GetCompressionInfoForLevel( 11 ).tableParkSize,
GetCompressionInfoForLevel( 12 ).tableParkSize,
GetCompressionInfoForLevel( 13 ).tableParkSize,
GetCompressionInfoForLevel( 14 ).tableParkSize,
GetCompressionInfoForLevel( 15 ).tableParkSize,
GetCompressionInfoForLevel( 16 ).tableParkSize,
GetCompressionInfoForLevel( 17 ).tableParkSize,
GetCompressionInfoForLevel( 18 ).tableParkSize,
GetCompressionInfoForLevel( 19 ).tableParkSize,
GetCompressionInfoForLevel( 20 ).tableParkSize,
GetCompressionInfoForLevel( 21 ).tableParkSize,
GetCompressionInfoForLevel( 22 ).tableParkSize,
GetCompressionInfoForLevel( 23 ).tableParkSize,
GetCompressionInfoForLevel( 24 ).tableParkSize,
GetCompressionInfoForLevel( 25 ).tableParkSize,
GetCompressionInfoForLevel( 26 ).tableParkSize,
GetCompressionInfoForLevel( 27 ).tableParkSize,
GetCompressionInfoForLevel( 28 ).tableParkSize,
GetCompressionInfoForLevel( 29 ).tableParkSize,
GetCompressionInfoForLevel( 30 ).tableParkSize,
GetCompressionInfoForLevel( 31 ).tableParkSize,
GetCompressionInfoForLevel( 32 ).tableParkSize,
GetCompressionInfoForLevel( 33 ).tableParkSize,
GetCompressionInfoForLevel( 34 ).tableParkSize,
GetCompressionInfoForLevel( 35 ).tableParkSize,
GetCompressionInfoForLevel( 36 ).tableParkSize,
GetCompressionInfoForLevel( 37 ).tableParkSize,
GetCompressionInfoForLevel( 38 ).tableParkSize,
GetCompressionInfoForLevel( 39 ).tableParkSize
}
);
}
58 changes: 58 additions & 0 deletions src/plotting/Compression.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,65 @@ struct CompressionLevelInfo<9>
static constexpr double ANS_R_VALUE = 4.54;
};

template<>
struct CompressionLevelInfo<10>
{
static constexpr uint32_t ENTRY_SIZE = 7;
static constexpr uint32_t STUB_BIT_SIZE = 26;
static constexpr size_t TABLE_PARK_SIZE = 7896;
static constexpr double ANS_R_VALUE = 4.54;
};

template<>
struct CompressionLevelInfo<11>
{
static constexpr uint32_t ENTRY_SIZE = 6;
static constexpr uint32_t STUB_BIT_SIZE = 22;
static constexpr size_t TABLE_PARK_SIZE = 6930;
static constexpr double ANS_R_VALUE = 4.54;
};

template<>
struct CompressionLevelInfo<12>
{
static constexpr uint32_t ENTRY_SIZE = 5;
static constexpr uint32_t STUB_BIT_SIZE = 18;
static constexpr size_t TABLE_PARK_SIZE = 5953;
static constexpr double ANS_R_VALUE = 4.54;
};

template<>
struct CompressionLevelInfo<13>
{
static constexpr uint32_t ENTRY_SIZE = 4;
static constexpr uint32_t STUB_BIT_SIZE = 14;
static constexpr size_t TABLE_PARK_SIZE = 4956;
static constexpr double ANS_R_VALUE = 4.54;
};

template<>
struct CompressionLevelInfo<14>
{
static constexpr uint32_t ENTRY_SIZE = 3;
static constexpr uint32_t STUB_BIT_SIZE = 10;
static constexpr size_t TABLE_PARK_SIZE = 3944;
static constexpr double ANS_R_VALUE = 4.54;
};

template<>
struct CompressionLevelInfo<15>
{
static constexpr uint32_t ENTRY_SIZE = 2;
static constexpr uint32_t STUB_BIT_SIZE = 6;
static constexpr size_t TABLE_PARK_SIZE = 2930;
static constexpr double ANS_R_VALUE = 4.54;
};

template<>
struct CompressionLevelInfo<16>
{
static constexpr uint32_t ENTRY_SIZE = 1;
static constexpr uint32_t STUB_BIT_SIZE = 2;
static constexpr size_t TABLE_PARK_SIZE = 1913;
static constexpr double ANS_R_VALUE = 4.54;
};

0 comments on commit adf8719

Please sign in to comment.