Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Q
QcmpCompressionLibrary
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
BioinformaticDataCompression
QcmpCompressionLibrary
Commits
b310fcb6
Commit
b310fcb6
authored
4 years ago
by
Vojtech Moravec
Browse files
Options
Downloads
Patches
Plain Diff
Add utility method createVerboseOption.
parent
310d345a
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/azgracompress/cli/CliConstants.java
+9
-7
9 additions, 7 deletions
src/main/java/azgracompress/cli/CliConstants.java
src/main/java/azgracompress/compression/VQImageCompressor.java
+5
-3
5 additions, 3 deletions
...ain/java/azgracompress/compression/VQImageCompressor.java
with
14 additions
and
10 deletions
src/main/java/azgracompress/cli/CliConstants.java
+
9
−
7
View file @
b310fcb6
...
@@ -56,9 +56,9 @@ public class CliConstants {
...
@@ -56,9 +56,9 @@ public class CliConstants {
@NotNull
@NotNull
public
static
Options
getOptions
()
{
public
static
Options
getOptions
()
{
Options
options
=
new
Options
();
final
Options
options
=
new
Options
();
OptionGroup
methodGroup
=
new
OptionGroup
();
final
OptionGroup
methodGroup
=
new
OptionGroup
();
methodGroup
.
setRequired
(
true
);
methodGroup
.
setRequired
(
true
);
methodGroup
.
addOption
(
new
Option
(
CliConstants
.
COMPRESS_SHORT
,
methodGroup
.
addOption
(
new
Option
(
CliConstants
.
COMPRESS_SHORT
,
CliConstants
.
COMPRESS_LONG
,
CliConstants
.
COMPRESS_LONG
,
...
@@ -90,7 +90,7 @@ public class CliConstants {
...
@@ -90,7 +90,7 @@ public class CliConstants {
methodGroup
.
addOption
(
new
Option
(
CliConstants
.
HELP_SHORT
,
CliConstants
.
HELP_LONG
,
false
,
"Print help"
));
methodGroup
.
addOption
(
new
Option
(
CliConstants
.
HELP_SHORT
,
CliConstants
.
HELP_LONG
,
false
,
"Print help"
));
OptionGroup
compressionMethodGroup
=
new
OptionGroup
();
final
OptionGroup
compressionMethodGroup
=
new
OptionGroup
();
compressionMethodGroup
.
addOption
(
createSQOption
());
compressionMethodGroup
.
addOption
(
createSQOption
());
compressionMethodGroup
.
addOption
(
createVQOption
());
compressionMethodGroup
.
addOption
(
createVQOption
());
...
@@ -104,10 +104,7 @@ public class CliConstants {
...
@@ -104,10 +104,7 @@ public class CliConstants {
false
,
false
,
"Use middle plane for codebook creation"
);
"Use middle plane for codebook creation"
);
options
.
addOption
(
new
Option
(
CliConstants
.
VERBOSE_SHORT
,
options
.
addOption
(
createVerboseOption
(
false
));
CliConstants
.
VERBOSE_LONG
,
false
,
"Make program verbose"
));
options
.
addOption
(
new
Option
(
CliConstants
.
WORKER_COUNT_SHORT
,
options
.
addOption
(
new
Option
(
CliConstants
.
WORKER_COUNT_SHORT
,
CliConstants
.
WORKER_COUNT_LONG
,
CliConstants
.
WORKER_COUNT_LONG
,
...
@@ -145,4 +142,9 @@ public class CliConstants {
...
@@ -145,4 +142,9 @@ public class CliConstants {
"Use vector quantization. Need to pass vector size eg. 9,9x1,3x3"
);
"Use vector quantization. Need to pass vector size eg. 9,9x1,3x3"
);
}
}
public
static
Option
createVerboseOption
(
final
boolean
onlyLongVersion
)
{
return
onlyLongVersion
?
new
Option
(
CliConstants
.
VERBOSE_LONG
,
false
,
"Make program verbose"
)
:
new
Option
(
CliConstants
.
VERBOSE_SHORT
,
CliConstants
.
VERBOSE_LONG
,
false
,
"Make program verbose"
);
}
}
}
This diff is collapsed.
Click to expand it.
src/main/java/azgracompress/compression/VQImageCompressor.java
+
5
−
3
View file @
b310fcb6
...
@@ -5,13 +5,15 @@ import azgracompress.cache.QuantizationCacheManager;
...
@@ -5,13 +5,15 @@ import azgracompress.cache.QuantizationCacheManager;
import
azgracompress.cache.VQCacheFile
;
import
azgracompress.cache.VQCacheFile
;
import
azgracompress.compression.exception.ImageCompressionException
;
import
azgracompress.compression.exception.ImageCompressionException
;
import
azgracompress.data.Range
;
import
azgracompress.data.Range
;
import
azgracompress.data.V3i
;
import
azgracompress.fileformat.QuantizationType
;
import
azgracompress.fileformat.QuantizationType
;
import
azgracompress.huffman.Huffman
;
import
azgracompress.huffman.Huffman
;
import
azgracompress.io.InputData
;
import
azgracompress.io.InputData
;
import
azgracompress.io.loader.IPlaneLoader
;
import
azgracompress.io.loader.IPlaneLoader
;
import
azgracompress.io.loader.PlaneLoaderFactory
;
import
azgracompress.io.loader.PlaneLoaderFactory
;
import
azgracompress.quantization.vector.*
;
import
azgracompress.quantization.vector.LBGResult
;
import
azgracompress.quantization.vector.LBGVectorQuantizer
;
import
azgracompress.quantization.vector.VQCodebook
;
import
azgracompress.quantization.vector.VectorQuantizer
;
import
azgracompress.utilities.Stopwatch
;
import
azgracompress.utilities.Stopwatch
;
import
azgracompress.utilities.Utils
;
import
azgracompress.utilities.Utils
;
import
org.jetbrains.annotations.NotNull
;
import
org.jetbrains.annotations.NotNull
;
...
@@ -330,7 +332,7 @@ public class VQImageCompressor extends CompressorDecompressorBase implements IIm
...
@@ -330,7 +332,7 @@ public class VQImageCompressor extends CompressorDecompressorBase implements IIm
}
}
final
int
[]
indices
=
quantizer
.
quantizeIntoIndices
(
voxelData
,
options
.
getWorkerCount
());
final
int
[]
indices
=
quantizer
.
quantizeIntoIndices
(
voxelData
,
options
.
getWorkerCount
());
//
final int[] indices = quantizer.quantizeIntoIndicesUsingKDTree(voxelData, options.getWorkerCount());
//
final int[] indices = quantizer.quantizeIntoIndicesUsingKDTree(voxelData, options.getWorkerCount());
voxelLayersSizes
[
voxelLayerIndex
]
=
writeHuffmanEncodedIndices
(
compressStream
,
huffman
,
indices
);
voxelLayersSizes
[
voxelLayerIndex
]
=
writeHuffmanEncodedIndices
(
compressStream
,
huffman
,
indices
);
stopwatch
.
stop
();
stopwatch
.
stop
();
if
(
options
.
isConsoleApplication
())
{
if
(
options
.
isConsoleApplication
())
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment