-
Notifications
You must be signed in to change notification settings - Fork 90
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add bitwise operations in formula & add round() in spi
- Loading branch information
Showing
10 changed files
with
241 additions
and
0 deletions.
There are no files selected for viewing
9 changes: 9 additions & 0 deletions
9
core/formula/src/main/java/org/csstudio/apputil/formula/bitwise/BitAND.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
package org.csstudio.apputil.formula.bitwise; | ||
|
||
public class BitAND extends TwoArgBitwiseOperation | ||
{ | ||
public BitAND() | ||
{ | ||
super("bitAND", "Bitwise AND (x, y)", (a, b) -> a & b); | ||
} | ||
} |
9 changes: 9 additions & 0 deletions
9
core/formula/src/main/java/org/csstudio/apputil/formula/bitwise/BitLeftShift.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
package org.csstudio.apputil.formula.bitwise; | ||
|
||
public class BitLeftShift extends TwoArgBitwiseOperation | ||
{ | ||
public BitLeftShift() | ||
{ | ||
super("bitLeftShift", "Bitwise Left Shift (x, y)", (a, b) -> a << b); | ||
} | ||
} |
9 changes: 9 additions & 0 deletions
9
core/formula/src/main/java/org/csstudio/apputil/formula/bitwise/BitNOT.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
package org.csstudio.apputil.formula.bitwise; | ||
|
||
public class BitNOT extends OneArgBitwiseOperation | ||
{ | ||
public BitNOT() | ||
{ | ||
super("bitNOT", "Bitwise NOT (x)", a -> ~a); | ||
} | ||
} |
9 changes: 9 additions & 0 deletions
9
core/formula/src/main/java/org/csstudio/apputil/formula/bitwise/BitOR.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
package org.csstudio.apputil.formula.bitwise; | ||
|
||
public class BitOR extends TwoArgBitwiseOperation | ||
{ | ||
public BitOR() | ||
{ | ||
super("bitOR", "Bitwise OR (x, y)", (a, b) -> a | b); | ||
} | ||
} |
9 changes: 9 additions & 0 deletions
9
core/formula/src/main/java/org/csstudio/apputil/formula/bitwise/BitRightShift.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
package org.csstudio.apputil.formula.bitwise; | ||
|
||
public class BitRightShift extends TwoArgBitwiseOperation | ||
{ | ||
public BitRightShift() | ||
{ | ||
super("bitRightShift", "Bitwise Right Shift (x, y)", (a, b) -> a >> b); | ||
} | ||
} |
9 changes: 9 additions & 0 deletions
9
core/formula/src/main/java/org/csstudio/apputil/formula/bitwise/BitXOR.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
package org.csstudio.apputil.formula.bitwise; | ||
|
||
public class BitXOR extends TwoArgBitwiseOperation | ||
{ | ||
public BitXOR() | ||
{ | ||
super("bitXOR", "Bitwise XOR (x, y)", (a, b) -> a ^ b); | ||
} | ||
} |
78 changes: 78 additions & 0 deletions
78
core/formula/src/main/java/org/csstudio/apputil/formula/bitwise/OneArgBitwiseOperation.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,78 @@ | ||
/******************************************************************************* | ||
* Copyright (c) 2019-2020 Oak Ridge National Laboratory. | ||
* All rights reserved. This program and the accompanying materials | ||
* are made available under the terms of the Eclipse Public License v1.0 | ||
* which accompanies this distribution, and is available at | ||
* http://www.eclipse.org/legal/epl-v10.html | ||
******************************************************************************/ | ||
package org.csstudio.apputil.formula.bitwise; | ||
|
||
import java.util.List; | ||
|
||
import org.csstudio.apputil.formula.spi.FormulaFunction; | ||
import org.epics.vtype.Alarm; | ||
import org.epics.vtype.Display; | ||
import org.epics.vtype.Time; | ||
import org.epics.vtype.VDouble; | ||
import org.epics.vtype.VType; | ||
import org.phoebus.core.vtypes.VTypeHelper; | ||
|
||
/** Helper for SPI-provided `long operation(long)` | ||
* @author Mathis Huriez | ||
*/ | ||
@SuppressWarnings("nls") | ||
class OneArgBitwiseOperation implements FormulaFunction | ||
{ | ||
@FunctionalInterface | ||
public interface OneArgOperation | ||
{ | ||
long calc(long arg); | ||
} | ||
|
||
private final String name; | ||
private final String description; | ||
private final OneArgOperation operation; | ||
|
||
protected OneArgBitwiseOperation(final String name, final String description, final OneArgOperation operation) | ||
{ | ||
this.name = name; | ||
this.description = description; | ||
this.operation = operation; | ||
} | ||
|
||
@Override | ||
public String getCategory() { | ||
return "bitwise"; | ||
} | ||
|
||
@Override | ||
public String getName() | ||
{ | ||
return name; | ||
} | ||
|
||
@Override | ||
public String getDescription() | ||
{ | ||
return description; | ||
} | ||
|
||
@Override | ||
public List<String> getArguments() | ||
{ | ||
return List.of("x"); | ||
} | ||
|
||
@Override | ||
public VType compute(final VType... args) throws Exception | ||
{ | ||
final double arg = VTypeHelper.toDouble(args[0]); | ||
final long a = (long) arg; | ||
if((double) a != arg) | ||
throw new Exception("Operation " + getName() + | ||
" takes integer type but received floating-point type"); | ||
final long value = operation.calc(a); | ||
return VDouble.of(value, Alarm.none(), Time.now(), Display.none()); | ||
} | ||
|
||
} |
79 changes: 79 additions & 0 deletions
79
core/formula/src/main/java/org/csstudio/apputil/formula/bitwise/TwoArgBitwiseOperation.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,79 @@ | ||
/******************************************************************************* | ||
* Copyright (c) 2019-2020 Oak Ridge National Laboratory. | ||
* All rights reserved. This program and the accompanying materials | ||
* are made available under the terms of the Eclipse Public License v1.0 | ||
* which accompanies this distribution, and is available at | ||
* http://www.eclipse.org/legal/epl-v10.html | ||
******************************************************************************/ | ||
package org.csstudio.apputil.formula.bitwise; | ||
|
||
import java.util.List; | ||
|
||
import org.csstudio.apputil.formula.spi.FormulaFunction; | ||
import org.epics.vtype.Alarm; | ||
import org.epics.vtype.Display; | ||
import org.epics.vtype.Time; | ||
import org.epics.vtype.VDouble; | ||
import org.epics.vtype.VType; | ||
import org.phoebus.core.vtypes.VTypeHelper; | ||
|
||
/** Helper for SPI-provided `long operation(long, long)` | ||
* @author Mathis Huriez | ||
*/ | ||
@SuppressWarnings("nls") | ||
class TwoArgBitwiseOperation implements FormulaFunction | ||
{ | ||
@FunctionalInterface | ||
public interface TwoArgOperation | ||
{ | ||
long calc(long a, long b); | ||
} | ||
|
||
private final String name; | ||
private final String description; | ||
private final TwoArgOperation operation; | ||
|
||
protected TwoArgBitwiseOperation(final String name, final String description, final TwoArgOperation operation) | ||
{ | ||
this.name = name; | ||
this.description = description; | ||
this.operation = operation; | ||
} | ||
|
||
@Override | ||
public String getCategory() { | ||
return "bitwise"; | ||
} | ||
|
||
@Override | ||
public String getName() | ||
{ | ||
return name; | ||
} | ||
|
||
@Override | ||
public String getDescription() | ||
{ | ||
return description; | ||
} | ||
|
||
@Override | ||
public List<String> getArguments() | ||
{ | ||
return List.of("x", "y"); | ||
} | ||
|
||
@Override | ||
public VType compute(final VType... args) throws Exception | ||
{ | ||
final double arg_a = VTypeHelper.toDouble(args[0]); | ||
final double arg_b = VTypeHelper.toDouble(args[1]); | ||
final long a = (long) arg_a, b = (long) arg_b; | ||
// Check if the conversion is accurate, else, send an exception | ||
if((double) a != arg_a || (double) b != arg_b) | ||
throw new Exception("Operation " + getName() + | ||
" takes integer types but received floating-point types"); | ||
final long value = operation.calc(a, b); | ||
return VDouble.of(value, Alarm.none(), Time.now(), Display.none()); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters