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
231280e8
Commit
231280e8
authored
4 years ago
by
Vojtech Moravec
Browse files
Options
Downloads
Patches
Plain Diff
Greatly simplify the wrapping logic for block loading.
parent
ae6606ab
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/azgracompress/io/loader/BasicLoader.java
+16
-71
16 additions, 71 deletions
src/main/java/azgracompress/io/loader/BasicLoader.java
with
16 additions
and
71 deletions
src/main/java/azgracompress/io/loader/BasicLoader.java
+
16
−
71
View file @
231280e8
...
@@ -135,27 +135,18 @@ public abstract class BasicLoader {
...
@@ -135,27 +135,18 @@ public abstract class BasicLoader {
return
blocks
;
return
blocks
;
}
}
private
void
loadBlock
(
final
int
[]
block
,
final
int
planeIndex
,
final
int
blockXOffset
,
final
int
blockYOffset
,
final
V2i
blockDim
)
{
private
void
loadBlock
(
final
int
[]
block
,
final
int
planeIndex
,
final
int
blockXOffset
,
final
int
blockYOffset
,
final
V2i
blockDim
)
{
int
srcX
,
srcY
;
int
srcX
,
srcY
;
for
(
int
y
=
0
;
y
<
blockDim
.
getY
();
y
++)
{
for
(
int
y
=
0
;
y
<
blockDim
.
getY
();
y
++)
{
srcY
=
blockYOffset
+
y
;
srcY
=
blockYOffset
+
y
;
// Row overflow
// Row overflow
if
(
srcY
>=
dims
.
getY
())
{
if
(
srcY
>=
dims
.
getY
())
{
if
(
wrappingStrategy
==
DataWrappingStrategy
.
LeaveBlank
)
{
if
(
wrappingStrategy
==
DataWrappingStrategy
.
LeaveBlank
)
break
;
break
;
}
else
if
(
wrappingStrategy
==
DataWrappingStrategy
.
ClampToEdge
)
{
if
(
wrappingStrategy
==
DataWrappingStrategy
.
ClampToEdge
)
{
srcY
=
dims
.
getY
()
-
1
;
final
int
srcRow
=
dims
.
getY
()
-
1
;
final
int
dstOffset
=
y
*
blockDim
.
getX
();
duplicateDataFromSrcRow
(
block
,
planeIndex
,
blockXOffset
,
blockDim
,
srcRow
,
dstOffset
);
continue
;
}
else
if
(
wrappingStrategy
==
DataWrappingStrategy
.
MirroredRepeat
)
{
}
else
if
(
wrappingStrategy
==
DataWrappingStrategy
.
MirroredRepeat
)
{
final
int
srcRow
=
dims
.
getY
()
-
((
srcY
-
dims
.
getY
())
+
1
);
srcY
=
dims
.
getY
()
-
((
srcY
-
dims
.
getY
())
+
1
);
final
int
dstOffset
=
y
*
blockDim
.
getX
();
duplicateDataFromSrcRow
(
block
,
planeIndex
,
blockXOffset
,
blockDim
,
srcRow
,
dstOffset
);
}
}
}
}
...
@@ -164,17 +155,12 @@ public abstract class BasicLoader {
...
@@ -164,17 +155,12 @@ public abstract class BasicLoader {
// Column overflow.
// Column overflow.
if
(
srcX
>=
dims
.
getX
())
{
if
(
srcX
>=
dims
.
getX
())
{
if
(
wrappingStrategy
==
DataWrappingStrategy
.
LeaveBlank
)
{
if
(
wrappingStrategy
==
DataWrappingStrategy
.
LeaveBlank
)
break
;
break
;
if
(
wrappingStrategy
==
DataWrappingStrategy
.
ClampToEdge
)
{
}
else
if
(
wrappingStrategy
==
DataWrappingStrategy
.
ClampToEdge
)
{
block
[
Block
.
index
(
x
,
y
,
blockDim
.
getX
())]
=
valueAt
(
planeIndex
,
Block
.
index
(
dims
.
getX
()
-
1
,
srcY
,
dims
.
getX
()));
srcX
=
dims
.
getX
()
-
1
;
continue
;
}
else
if
(
wrappingStrategy
==
DataWrappingStrategy
.
MirroredRepeat
)
{
}
else
if
(
wrappingStrategy
==
DataWrappingStrategy
.
MirroredRepeat
)
{
srcX
=
dims
.
getX
()
-
((
srcX
-
dims
.
getX
())
+
1
);
block
[
Block
.
index
(
x
,
y
,
blockDim
.
getX
())]
=
valueAt
(
planeIndex
,
Block
.
index
(
dims
.
getX
()
-
((
srcX
-
dims
.
getX
())
+
1
),
srcY
,
dims
.
getX
()));
continue
;
}
}
}
}
block
[
Block
.
index
(
x
,
y
,
blockDim
.
getX
())]
=
valueAt
(
planeIndex
,
Block
.
index
(
srcX
,
srcY
,
dims
.
getX
()));
block
[
Block
.
index
(
x
,
y
,
blockDim
.
getX
())]
=
valueAt
(
planeIndex
,
Block
.
index
(
srcX
,
srcY
,
dims
.
getX
()));
...
@@ -182,35 +168,6 @@ public abstract class BasicLoader {
...
@@ -182,35 +168,6 @@ public abstract class BasicLoader {
}
}
}
}
private
void
duplicateDataFromSrcRow
(
final
int
[]
block
,
final
int
planeIndex
,
final
int
blockXOffset
,
final
V2i
blockDim
,
final
int
srcRow
,
final
int
dstOffset
)
{
int
srcX
;
for
(
int
x
=
0
;
x
<
blockDim
.
getX
();
x
++)
{
srcX
=
(
blockXOffset
+
x
);
if
(
srcX
>=
dims
.
getX
())
srcX
=
dims
.
getX
()
-
1
;
block
[
dstOffset
+
x
]
=
valueAt
(
planeIndex
,
Block
.
index
(
srcX
,
srcRow
,
dims
.
getX
()));
}
}
private
void
duplicateDataFromSrcRow
(
final
int
[]
block
,
final
int
[]
planeData
,
final
int
blockXOffset
,
final
V2i
blockDim
,
final
int
srcRow
,
final
int
dstOffset
)
{
int
srcX
;
for
(
int
x
=
0
;
x
<
blockDim
.
getX
();
x
++)
{
srcX
=
(
blockXOffset
+
x
);
if
(
srcX
>=
dims
.
getX
())
srcX
=
dims
.
getX
()
-
1
;
block
[
dstOffset
+
x
]
=
planeData
[
Block
.
index
(
srcX
,
srcRow
,
dims
.
getX
())];
}
}
private
void
loadBlock
(
final
int
[]
block
,
final
int
[]
planeData
,
final
int
blockXOffset
,
final
int
blockYOffset
,
final
V2i
blockDim
)
{
private
void
loadBlock
(
final
int
[]
block
,
final
int
[]
planeData
,
final
int
blockXOffset
,
final
int
blockYOffset
,
final
V2i
blockDim
)
{
int
srcX
,
srcY
;
int
srcX
,
srcY
;
...
@@ -218,36 +175,24 @@ public abstract class BasicLoader {
...
@@ -218,36 +175,24 @@ public abstract class BasicLoader {
srcY
=
blockYOffset
+
y
;
srcY
=
blockYOffset
+
y
;
// Row overflow
// Row overflow
if
(
srcY
>=
dims
.
getY
())
{
if
(
srcY
>=
dims
.
getY
())
{
if
(
wrappingStrategy
==
DataWrappingStrategy
.
LeaveBlank
)
{
if
(
wrappingStrategy
==
DataWrappingStrategy
.
LeaveBlank
)
break
;
break
;
}
else
if
(
wrappingStrategy
==
DataWrappingStrategy
.
ClampToEdge
)
{
if
(
wrappingStrategy
==
DataWrappingStrategy
.
ClampToEdge
)
{
srcY
=
dims
.
getY
()
-
1
;
final
int
srcRow
=
dims
.
getY
()
-
1
;
final
int
dstOffset
=
y
*
blockDim
.
getX
();
duplicateDataFromSrcRow
(
block
,
planeData
,
blockXOffset
,
blockDim
,
srcRow
,
dstOffset
);
continue
;
}
else
if
(
wrappingStrategy
==
DataWrappingStrategy
.
MirroredRepeat
)
{
}
else
if
(
wrappingStrategy
==
DataWrappingStrategy
.
MirroredRepeat
)
{
final
int
srcRow
=
dims
.
getY
()
-
((
srcY
-
dims
.
getY
())
+
1
);
srcY
=
dims
.
getY
()
-
((
srcY
-
dims
.
getY
())
+
1
);
final
int
dstOffset
=
y
*
blockDim
.
getX
();
duplicateDataFromSrcRow
(
block
,
planeData
,
blockXOffset
,
blockDim
,
srcRow
,
dstOffset
);
}
}
}
}
for
(
int
x
=
0
;
x
<
blockDim
.
getX
();
x
++)
{
for
(
int
x
=
0
;
x
<
blockDim
.
getX
();
x
++)
{
srcX
=
blockXOffset
+
x
;
srcX
=
blockXOffset
+
x
;
// Column overflow.
// Column overflow.
if
(
srcX
>=
dims
.
getX
())
{
if
(
srcX
>=
dims
.
getX
())
{
if
(
wrappingStrategy
==
DataWrappingStrategy
.
LeaveBlank
)
{
if
(
wrappingStrategy
==
DataWrappingStrategy
.
LeaveBlank
)
break
;
break
;
if
(
wrappingStrategy
==
DataWrappingStrategy
.
ClampToEdge
)
{
}
else
if
(
wrappingStrategy
==
DataWrappingStrategy
.
ClampToEdge
)
{
block
[
Block
.
index
(
x
,
y
,
blockDim
.
getX
())]
=
planeData
[
Block
.
index
(
dims
.
getX
()
-
1
,
srcY
,
dims
.
getX
())];
srcX
=
dims
.
getX
()
-
1
;
continue
;
}
else
if
(
wrappingStrategy
==
DataWrappingStrategy
.
MirroredRepeat
)
{
}
else
if
(
wrappingStrategy
==
DataWrappingStrategy
.
MirroredRepeat
)
{
srcX
=
dims
.
getX
()
-
((
srcX
-
dims
.
getX
())
+
1
);
block
[
Block
.
index
(
x
,
y
,
blockDim
.
getX
())]
=
planeData
[
Block
.
index
(
dims
.
getX
()
-
((
srcX
-
dims
.
getX
())
+
1
),
srcY
,
dims
.
getX
())];
continue
;
}
}
}
}
...
...
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