Skip to content

Support delta value sorting on string PVs #3508

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
Aug 13, 2025
Merged

Support delta value sorting on string PVs #3508

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
6 changes: 2 additions & 4 deletions app/save-and-restore/util/src/main/java/org/phoebus/saveandrestore/util/Utilities.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,11 +663,10 @@ public static VTypeComparison valueToCompareString(VType value, VType baseValue,
int diff = b == null ? (c == null ? 0 : 1) : (c == null ? -1 : b.compareTo(c));
return new VTypeComparison(str, diff, diff == 0);
} else if (value instanceof VString && baseValue instanceof VString) {
String str = valueToString(value);
String b = ((VString) value).getValue();
String c = ((VString) baseValue).getValue();
int diff = b == null ? (c == null ? 0 : 1) : (c == null ? -1 : b.compareTo(c));
return new VTypeComparison(str, diff, diff == 0);
return new VTypeComparison(b, diff,diff == 0, Math.abs(diff));
} else if (value instanceof VNumberArray && baseValue instanceof VNumberArray) {
String sb = valueToString(value);
boolean equal = areValuesEqual(value, baseValue, Optional.empty());
Expand Down Expand Up @@ -873,11 +872,10 @@ public static VTypeComparison deltaValueToString(VType value, VType baseValue, O
int diff = b == null ? (c == null ? 0 : 1) : (c == null ? -1 : b.compareTo(c));
return new VTypeComparison(str, diff, diff == 0);
} else if (value instanceof VString && baseValue instanceof VString) {
String str = valueToString(value);
String b = ((VString) value).getValue();
String c = ((VString) baseValue).getValue();
int diff = b == null ? (c == null ? 0 : 1) : (c == null ? -1 : b.compareTo(c));
return new VTypeComparison(str, diff, diff == 0);
return new VTypeComparison(b, diff, diff == 0, Math.abs(diff));
} else if (value instanceof VNumberArray && baseValue instanceof VNumberArray) {
boolean equal = areValuesEqual(value, baseValue, Optional.empty());
return new VTypeComparison(equal ? "---" : "NOT EQUAL", equal ? 0 : 1, equal);
Expand Down
3 changes: 2 additions & 1 deletion app/save-and-restore/util/src/test/java/org/phoebus/saveandrestore/util/UtilitiesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -702,7 +702,8 @@ public void testValueToCompareString() {
assertEquals("a", result.getString());
assertTrue(result.getValuesEqual() < 0);
assertFalse(result.isWithinThreshold());
assertEquals(0, result.getAbsoluteDelta(), 0.0);
int delta = ((VString) val1).getValue().compareTo(((VString) val2).getValue());
assertEquals(Math.abs(delta), result.getAbsoluteDelta(), 0.0);
}

/**
Expand Down