diff --git a/pom.xml b/pom.xml
index 3440d6a..228617c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
UTF-8
1.8
1.8
- 0.0.2
+ 0.0.3
7.9.0
2.16.0
3.0.0-M4
@@ -43,7 +43,7 @@
com.christianheina.communication
jantenna-commons
- ${antenna-commons.version}
+ ${jantenna-commons.version}
diff --git a/src/main/java/com/christianheina/communication/jantenna/phasedarray/PhasedArrayAntenna.java b/src/main/java/com/christianheina/communication/jantenna/phasedarray/PhasedArrayAntenna.java
index e7c7ce5..23a0fe6 100644
--- a/src/main/java/com/christianheina/communication/jantenna/phasedarray/PhasedArrayAntenna.java
+++ b/src/main/java/com/christianheina/communication/jantenna/phasedarray/PhasedArrayAntenna.java
@@ -127,4 +127,61 @@ private static CompletableFuture calculateArrayFactorAsync(ExecutorServ
return future;
}
+ /**
+ * Create phased array.
+ * Both {@code arrayFactor} and {@code averageEmbeddedAntennaField} must contain same angles.
+ *
+ * @param averageEmbeddedAntennaField
+ * the average embedded field.
+ * @param arrayFactor
+ * the array factor field.
+ *
+ * @return
+ */
+ public static Field newPhasedArray(Field averageEmbeddedAntennaField, Field arrayFactor) {
+ return averageEmbeddedAntennaField.multiply(arrayFactor);
+ }
+
+ /**
+ * Create phased array
+ *
+ * @param averageEmbeddedAntennaField
+ * the average embedded field. Must contain same angles as the {@code angles}
+ * @param frequency
+ * wavelength
+ * @param antennaArray
+ * antenna array to use when creating phased array
+ * @param angles
+ * angles used in the created phased array
+ *
+ * @return a field containing the phased array
+ */
+ public static Field newPhasedArrayAsync(Field averageEmbeddedAntennaField, double frequency,
+ AntennaArray antennaArray, List angles) {
+ Field arrayFactor = newArrayFactorAsync(frequency, antennaArray, angles);
+ return newPhasedArray(averageEmbeddedAntennaField, arrayFactor);
+ }
+
+ /**
+ * Create phased array
+ *
+ * @param averageEmbeddedAntennaField
+ * the average embedded field. Must contain same angles as the {@code angles}
+ * @param executorService
+ * the ExecutorService used for asynchronous array factor calculations
+ * @param frequency
+ * wavelength
+ * @param antennaArray
+ * antenna array to use when creating phased array
+ * @param angles
+ * angles used in the created phased array
+ *
+ * @return a field containing the phased array
+ */
+ public static Field newPhasedArrayAsync(Field averageEmbeddedAntennaField, ExecutorService executorService,
+ double frequency, AntennaArray antennaArray, List angles) {
+ Field arrayFactor = newArrayFactorAsync(executorService, frequency, antennaArray, angles);
+ return newPhasedArray(averageEmbeddedAntennaField, arrayFactor);
+ }
+
}
diff --git a/src/test/java/com/christianheina/communication/jantenna/phasedarray/PhasedArrayAntennaTest.java b/src/test/java/com/christianheina/communication/jantenna/phasedarray/PhasedArrayAntennaTest.java
index 78c34a3..02e01aa 100644
--- a/src/test/java/com/christianheina/communication/jantenna/phasedarray/PhasedArrayAntennaTest.java
+++ b/src/test/java/com/christianheina/communication/jantenna/phasedarray/PhasedArrayAntennaTest.java
@@ -16,6 +16,8 @@
package com.christianheina.communication.jantenna.phasedarray;
+import java.io.File;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.Executors;
@@ -38,6 +40,9 @@
@SuppressWarnings("javadoc")
public class PhasedArrayAntennaTest {
+ private static final String AVERAGE_EMBEDDED_FIELD_PATH = new File(PhasedArrayAntennaTest.class.getClassLoader()
+ .getResource("example_sphere_gaussian_model_field.json").getFile()).getPath();
+
@Test
public void newArrayFactorAsyncSuppliedExecutorServiceTest() {
double freq = 28 * Math.pow(10, 9);
@@ -101,4 +106,98 @@ public void newArrayFactorAsyncTest() {
}
+ @Test
+ public void newPhasedArrayTest() throws IOException {
+ double freq = 28 * Math.pow(10, 9);
+ List angleList = ThetaPhi.equallySpacedSphere(1);
+ ThetaPhi steeringAngle = ThetaPhi.fromDegrees(90, 0);
+ AntennaArray antennaArray = AntennaArray.fromEquallySpacedArray(1, 24, 16, 0.5, freq,
+ WeightAlgorithm.newConjugateWeightAlgorithmFromLambda(Util.calculateLambda(freq), steeringAngle));
+ Field arrayFactor = PhasedArrayAntenna.newArrayFactorAsync(Executors.newSingleThreadExecutor(), freq,
+ antennaArray, angleList);
+ Field averageEmbeddedField = Field.loadJson(AVERAGE_EMBEDDED_FIELD_PATH);
+ Field phasedArrayField = PhasedArrayAntenna.newPhasedArray(averageEmbeddedField, arrayFactor);
+ Assert.assertEquals(phasedArrayField.getThetaPhiList().size(), angleList.size());
+ phasedArrayField.getAvailableElectricFields().forEach(electricFieldName -> {
+ List electricFieldList = phasedArrayField.getElectricField(electricFieldName);
+ double max = Double.MIN_VALUE;
+ List maxAngleList = new ArrayList<>();
+ for (int i = 0; i < electricFieldList.size(); i++) {
+ if (electricFieldList.get(i).abs() >= max) {
+ max = electricFieldList.get(i).abs();
+ maxAngleList.add(angleList.get(i));
+ }
+ }
+ boolean hasAngleInList = false;
+ for (ThetaPhi thetaPhi : maxAngleList) {
+ if (thetaPhi.getTheta() == steeringAngle.getTheta() && thetaPhi.getPhi() == steeringAngle.getPhi()) {
+ hasAngleInList = true;
+ }
+ }
+ Assert.assertTrue(hasAngleInList);
+ });
+ }
+
+ @Test
+ public void newPhasedArrayAsyncTest() throws IOException {
+ double freq = 28 * Math.pow(10, 9);
+ List angleList = ThetaPhi.equallySpacedSphere(1);
+ ThetaPhi steeringAngle = ThetaPhi.fromDegrees(90, 0);
+ AntennaArray antennaArray = AntennaArray.fromEquallySpacedArray(1, 24, 16, 0.5, freq,
+ WeightAlgorithm.newConjugateWeightAlgorithmFromLambda(Util.calculateLambda(freq), steeringAngle));
+ Field averageEmbeddedField = Field.loadJson(AVERAGE_EMBEDDED_FIELD_PATH);
+ Field phasedArrayField = PhasedArrayAntenna.newPhasedArrayAsync(averageEmbeddedField, freq, antennaArray,
+ angleList);
+ Assert.assertEquals(phasedArrayField.getThetaPhiList().size(), angleList.size());
+ phasedArrayField.getAvailableElectricFields().forEach(electricFieldName -> {
+ List electricFieldList = phasedArrayField.getElectricField(electricFieldName);
+ double max = Double.MIN_VALUE;
+ List maxAngleList = new ArrayList<>();
+ for (int i = 0; i < electricFieldList.size(); i++) {
+ if (electricFieldList.get(i).abs() >= max) {
+ max = electricFieldList.get(i).abs();
+ maxAngleList.add(angleList.get(i));
+ }
+ }
+ boolean hasAngleInList = false;
+ for (ThetaPhi thetaPhi : maxAngleList) {
+ if (thetaPhi.getTheta() == steeringAngle.getTheta() && thetaPhi.getPhi() == steeringAngle.getPhi()) {
+ hasAngleInList = true;
+ }
+ }
+ Assert.assertTrue(hasAngleInList);
+ });
+ }
+
+ @Test
+ public void newPhasedArrayAsyncSuppliedExecutorServiceTest() throws IOException {
+ double freq = 28 * Math.pow(10, 9);
+ List angleList = ThetaPhi.equallySpacedSphere(1);
+ ThetaPhi steeringAngle = ThetaPhi.fromDegrees(90, 0);
+ AntennaArray antennaArray = AntennaArray.fromEquallySpacedArray(1, 24, 16, 0.5, freq,
+ WeightAlgorithm.newConjugateWeightAlgorithmFromLambda(Util.calculateLambda(freq), steeringAngle));
+ Field averageEmbeddedField = Field.loadJson(AVERAGE_EMBEDDED_FIELD_PATH);
+ Field phasedArrayField = PhasedArrayAntenna.newPhasedArrayAsync(averageEmbeddedField,
+ Executors.newSingleThreadExecutor(), freq, antennaArray, angleList);
+ Assert.assertEquals(phasedArrayField.getThetaPhiList().size(), angleList.size());
+ phasedArrayField.getAvailableElectricFields().forEach(electricFieldName -> {
+ List electricFieldList = phasedArrayField.getElectricField(electricFieldName);
+ double max = Double.MIN_VALUE;
+ List maxAngleList = new ArrayList<>();
+ for (int i = 0; i <