Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
15edbbb
feat: indexed table class can handle more than 4 indices
N-Plx Jul 17, 2025
52250a6
Merge branch 'development' into 755-allow-more-than-four-indices-in-i…
N-Plx Jul 22, 2025
9790285
feat: default constructor for the IndexGenerator class
N-Plx Jul 23, 2025
3df75fc
restoring main class as it was
N-Plx Jul 23, 2025
f1234f4
Merge branch '755-allow-more-than-four-indices-in-indexed-tables' of …
N-Plx Jul 23, 2025
6c9ebc9
update branch (#768)
N-Plx Jul 31, 2025
aba50a8
Merge branch 'development' into 755-allow-more-than-four-indices-in-i…
c-dilks Jul 31, 2025
a5f9dcb
Merge branch 'development' into 755-allow-more-than-four-indices-in-i…
c-dilks Aug 1, 2025
8a19e73
feat: can parse any byte shifts array for indexed tables
N-Plx Aug 4, 2025
887febb
Merge branch 'development' into 755-allow-more-than-four-indices-in-i…
N-Plx Aug 4, 2025
b10d9d8
default byte shift array can only be used for less than 4 indices
N-Plx Aug 4, 2025
28d70f0
Merge branch '755-allow-more-than-four-indices-in-indexed-tables' of …
N-Plx Aug 4, 2025
e56794a
misc fixes to compute long key and checks for byte shifts and index f…
N-Plx Aug 6, 2025
6fa0d10
Merge branch 'development' into 755-allow-more-than-four-indices-in-i…
N-Plx Aug 6, 2025
c53b10d
check bin width compatible with int
N-Plx Aug 7, 2025
df7d4f6
fix retrieving index from key
N-Plx Aug 7, 2025
909e2a2
Merge branch 'development' into 755-allow-more-than-four-indices-in-i…
N-Plx Aug 7, 2025
9fa5e47
Merge branch 'development' into 755-allow-more-than-four-indices-in-i…
raffaelladevita Aug 8, 2025
6f37c93
Merge branch 'development' into 755-allow-more-than-four-indices-in-i…
N-Plx Aug 8, 2025
6445270
Merge branch 'development' into 755-allow-more-than-four-indices-in-i…
N-Plx Aug 8, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public Set<Integer> getSectors(){
Set<Integer> sectors = new HashSet<Integer>();

for(Long item : list){
int sect = IndexedList.IndexGenerator.getIndex(item, 0);
int sect = this.collection.getIndexGenerator().getIndex(item, 0);
sectors.add(sect);
}
return sectors;
Expand All @@ -97,9 +97,9 @@ public Set<Integer> getLayers(int sector){
Set<Long> list = this.collection.getMap().keySet();
Set<Integer> layers = new HashSet<Integer>();
for(Long item : list){
int sect = IndexedList.IndexGenerator.getIndex(item, 0);
int sect = this.collection.getIndexGenerator().getIndex(item, 0);
if(sect==sector){
int lay = IndexedList.IndexGenerator.getIndex(item, 1);
int lay = this.collection.getIndexGenerator().getIndex(item, 1);
layers.add(lay);
}
}
Expand All @@ -115,10 +115,10 @@ public Set<Integer> getComponents(int sector, int layer){
Set<Long> list = this.collection.getMap().keySet();
Set<Integer> components = new HashSet<Integer>();
for(Long item : list){
int sect = IndexedList.IndexGenerator.getIndex(item, 0);
int lay = IndexedList.IndexGenerator.getIndex(item, 1);
int sect = this.collection.getIndexGenerator().getIndex(item, 0);
int lay = this.collection.getIndexGenerator().getIndex(item, 1);
if(sect==sector&&lay==layer){
int comp = IndexedList.IndexGenerator.getIndex(item, 2);
int comp = this.collection.getIndexGenerator().getIndex(item, 2);
components.add(comp);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public void save(String file){
StringBuilder str = new StringBuilder();
for(int i = 0; i < nindex; i++){
str.append(
String.format("%3d ",IndexedList.IndexGenerator.getIndex(entry.getKey(),i)));
String.format("%3d ",this.getList().getIndexGenerator().getIndex(entry.getKey(),i)));
}
int ncolumns = entry.getValue().getSize();
for(int i = 0; i < ncolumns; i++){
Expand Down
Loading
Loading