Change Flim Op names

gselzer · gselzer · commit 090bc552b1a2 · 2024-04-10T09:03:40.000-05:00
Thanks to @JenuC for the suggestions!
diff --git a/scijava-ops-flim/src/main/java/org/scijava/ops/flim/AmplitudeFractions.java b/scijava-ops-flim/src/main/java/org/scijava/ops/flim/AmplitudeFractions.java
@@ -45,15 +45,15 @@
  * @author Dasong Gao
  * @author Gabriel Selzer
  */
-public class FractionalContributions {
+public class AmplitudeFractions {
 
 	/**
 	 * @param rslt the results from fitting an image
 	 * @param index the index
 	 * @return a percentage image
-	 * @implNote op names="flim.aPercent", type=Function
+	 * @implNote op names="flim.amplitudeFraction", type=Function
 	 */
-	public static Img<FloatType> defaultFractionalContribution( //
+	public static Img<FloatType> defaultAmplitudeFraction( //
 		FitResults rslt, //
 		int index //
 	) {
diff --git a/scijava-ops-flim/src/main/java/org/scijava/ops/flim/impl/Creators.java b/scijava-ops-flim/src/main/java/org/scijava/ops/flim/impl/Creators.java
@@ -51,7 +51,7 @@ private Creators() {
 	 *
 	 * @param size the width/height of the kernel
 	 * @return a kernel for use in Flim
-	 * @implNote op names="create.kernelFlim" type=Function
+	 * @implNote op names="create.kernelSum" type=Function
 	 */
 	public static Img<DoubleType> makeSquareKernel(int size) {
 		Img<DoubleType> out = ArrayImgs.doubles(size, size, 1);
diff --git a/scijava-ops-flim/src/test/java/org/scijava/ops/flim/AmplitudeFractionsTest.java b/scijava-ops-flim/src/test/java/org/scijava/ops/flim/AmplitudeFractionsTest.java
@@ -36,17 +36,17 @@
 import org.scijava.types.Nil;
 
 /**
- * Tests {@link FractionalContributions} ops.
+ * Tests {@link AmplitudeFractions} ops.
  *
  * @author Dasong Gao
  * @author Gabriel Selzer
  */
-public class FractionalContributionsTest extends AbstractFlimTest {
+public class AmplitudeFractionsTest extends AbstractFlimTest {
 
 	@Test
 	public void testDefaultFractionalContribution() {
 		int i = 0;
-		final Img<FloatType> A1Perc = ops.binary("flim.aPercent") //
+		final Img<FloatType> A1Perc = ops.binary("flim.amplitudeFraction") //
 			.input(rslt, 0) //
 			.outType(new Nil<Img<FloatType>>()
 			{}) //
diff --git a/scijava-ops-flim/src/test/java/org/scijava/ops/flim/FitTest.java b/scijava-ops-flim/src/test/java/org/scijava/ops/flim/FitTest.java
@@ -123,7 +123,7 @@ public void testRLDFitImg() {
 	@Test
 	public void testBinning() {
 		long ms = System.currentTimeMillis();
-		var kernel = ops.unary("create.kernelFlim").input(3).apply();
+		var kernel = ops.unary("create.kernelSum").input(3).apply();
 		FitResults out = ops.ternary("flim.fitRLD") //
 			.input(param, roi, kernel) //
 			.outType(FitResults.class) //

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ private Creators() {`
`51`	`51`	`*`
`52`	`52`	`* @param size the width/height of the kernel`
`53`	`53`	`* @return a kernel for use in Flim`
`54`		`- * @implNote op names="create.kernelFlim" type=Function`
	`54`	`+ * @implNote op names="create.kernelSum" type=Function`
`55`	`55`	`*/`
`56`	`56`	`public static Img<DoubleType> makeSquareKernel(int size) {`
`57`	`57`	`Img<DoubleType> out = ArrayImgs.doubles(size, size, 1);`