Skip to content

fix: order components according to their index #166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 13, 2024
Merged

fix: order components according to their index #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion analysis/src/test/java/ComputeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
import java.util.Random;
import java.util.random.RandomGenerator;

import net.laprun.sustainability.power.SensorUnit;
import org.junit.jupiter.api.Test;

import net.laprun.sustainability.power.SensorMetadata;
import net.laprun.sustainability.power.SensorUnit;
import net.laprun.sustainability.power.analysis.Compute;
import net.laprun.sustainability.power.analysis.MeanComponentProcessor;
import net.laprun.sustainability.power.measure.OngoingPowerMeasure;
Expand Down
6 changes: 3 additions & 3 deletions metadata/src/main/java/net/laprun/sustainability/power/SensorMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import java.util.BitSet;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
Expand Down Expand Up @@ -37,11 +37,11 @@ public SensorMetadata(List<ComponentMetadata> components, String documentation)
}

final var cardinality = components.size();
this.components = new HashMap<>(cardinality);
this.components = new LinkedHashMap<>(cardinality);
this.documentation = documentation;
final var errors = new Errors();
final var indices = new BitSet(cardinality);
components.forEach(component -> {
components.stream().sorted(Comparator.comparingInt(ComponentMetadata::index)).forEach(component -> {
// check that index is valid
final var index = component.index;
if (index < 0 || index >= cardinality) {
Expand Down
12 changes: 12 additions & 0 deletions metadata/src/test/java/net/laprun/sustainability/power/SensorMetadataTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,16 @@ void shouldFailIfNoComponentsAreProvided() {
() -> new SensorMetadata(List.of(), ""));
assertEquals("Must provide at least one component", e2.getMessage());
}

@Test
void shouldOrderComponentsByIndexOrder() {
final var metadata = new SensorMetadata(List.of(
new SensorMetadata.ComponentMetadata("foo", 1, null, true, SensorUnit.W),
new SensorMetadata.ComponentMetadata("component2", 0, null, true, SensorUnit.decimalPercentage)), "");

int i = 0;
for (var value : metadata.components().values()) {
assertEquals(i++, value.index());
}
}
}
Loading