Update propagation module architecture to accept different P2P models

noisemodelling-jdbc/src/main/java/org/noise_planet/noisemodelling/jdbc/NoiseMapByReceiverMaker.java

@@ -27,6 +27,7 @@
 import org.noise_planet.noisemodelling.pathfinder.CutPlaneVisitorFactory;
 import org.noise_planet.noisemodelling.pathfinder.PathFinder;
 import org.noise_planet.noisemodelling.pathfinder.utils.profiler.ProfilerThread;
+import org.noise_planet.noisemodelling.propagation.PropagationModelCreator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -49,18 +50,24 @@ public class NoiseMapByReceiverMaker extends GridMapMaker {
     /** If true, all processing are aborted and all threads will be shutdown */
     public AtomicBoolean aborted = new AtomicBoolean(false);
     private final NoiseMapDatabaseParameters noiseMapDatabaseParameters = new NoiseMapDatabaseParameters();
-    private IComputeRaysOutFactory computeRaysOutFactory = new DefaultCutPlaneProcessing(noiseMapDatabaseParameters, exitWhenDone, aborted);
+    private IComputeRaysOutFactory computeRaysOutFactory;
     private Logger logger = LoggerFactory.getLogger(NoiseMapByReceiverMaker.class);
     private int threadCount = 0;
     private ProfilerThread profilerThread;
 
     SceneDatabaseInputSettings sceneDatabaseInputSettings = new SceneDatabaseInputSettings();
 
-    /** ?? for train source ? TODO is it related to sources ? if yes then provide a special column for this kind of source */
-
+    /**
+     * Constructor for NoiseMapByReceiverMaker object.
+     *
+     * @param buildingsTableName Buildings table
+     * @param sourcesTableName  Source table
+     * @param receiverTableName Receiver table
+     */
     public NoiseMapByReceiverMaker(String buildingsTableName, String sourcesTableName, String receiverTableName) {
         super(buildingsTableName, sourcesTableName);
         this.receiverTableName = receiverTableName;
+        computeRaysOutFactory = new DefaultCutPlaneProcessing(noiseMapDatabaseParameters, exitWhenDone, aborted);
     }
 
     /**
@@ -428,7 +435,20 @@ public interface IComputeRaysOutFactory {
          * @return an object that computes paths out for noise map computation.
          */
         CutPlaneVisitorFactory create(SceneWithEmission cellData);
-    }
 
+        /**
+         * Setter for propagationModelCreator
+         *
+         * @param propagationModelCreator interface for PropagationModel creation
+         */
+        void setPropagationModelCreator(PropagationModelCreator propagationModelCreator);
+
+        /**
+         * Getter for propagationModelCreator
+         *
+         * @return interface for PropagationModel creation
+         */
+        PropagationModelCreator getPropagationModelCreator();
 
+    }
 }

noisemodelling-jdbc/src/main/java/org/noise_planet/noisemodelling/jdbc/output/AttenuationOutputMultiThread.java

@@ -14,10 +14,12 @@
 import org.noise_planet.noisemodelling.jdbc.input.SceneWithEmission;
 import org.noise_planet.noisemodelling.pathfinder.CutPlaneVisitor;
 import org.noise_planet.noisemodelling.pathfinder.CutPlaneVisitorFactory;
-import org.noise_planet.noisemodelling.propagation.AttenuationComputeOutput;
+import org.noise_planet.noisemodelling.propagation.PropagationModel;
+import org.noise_planet.noisemodelling.propagation.PropagationModelCreator;
+import org.noise_planet.noisemodelling.propagation.cnossos.CnossosPropagationModel;
 
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * This class is built on each new computation cell area. It will create for each thread (range of receivers) an instance
@@ -29,25 +31,35 @@ public class AttenuationOutputMultiThread implements CutPlaneVisitorFactory {
     public NoiseMapDatabaseParameters noiseMapDatabaseParameters = new NoiseMapDatabaseParameters();
     public AtomicBoolean exitWhenDone = new AtomicBoolean(false);
     public AtomicBoolean aborted = new AtomicBoolean(false);
-    public AtomicLong cnossosPathCount = new AtomicLong();
+    public AtomicInteger cutProfileCount = new AtomicInteger();
+    public PropagationModel propagationModel;
 
     /**
      * Create NoiseMap constructor
-     * @param inputData
-     * @param resultsCache
-     * @param noiseMapDatabaseParameters
+     *
+     * @param inputData Geometrical information about the propagation scene
+     * @param resultsCache Results cache
+     * @param noiseMapDatabaseParameters Propagation parameters
      */
-    public AttenuationOutputMultiThread(SceneWithEmission inputData,
+    public AttenuationOutputMultiThread(SceneWithEmission inputData, PropagationModelCreator propagationModelCreator,
                                         ResultsCache resultsCache, NoiseMapDatabaseParameters noiseMapDatabaseParameters, AtomicBoolean exitWhenDone, AtomicBoolean aborted) {
         this.resultsCache = resultsCache;
         this.sceneWithEmission = inputData;
         this.noiseMapDatabaseParameters = noiseMapDatabaseParameters;
         this.exitWhenDone = exitWhenDone;
         this.aborted = aborted;
+        this.propagationModel = propagationModelCreator.create();
     }
 
+    /**
+     * Constructor for AttenuationOutputMultiThread with Cnossos propagation model
+     * (for testing purpose).
+     *
+     * @param sceneWithEmission Geometrical information about the propagation scene
+     */
     public AttenuationOutputMultiThread(SceneWithEmission sceneWithEmission) {
         this.sceneWithEmission = sceneWithEmission;
+        this.propagationModel = new CnossosPropagationModel();
     }
 
     /**