Use shared pointer for custom source (#56)

* Use shared pointer for setting source

* Add const in setParticleType arg

* Bump version

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
 project(
   ViennaRay
   LANGUAGES CXX
-  VERSION 2.1.0)
+  VERSION 2.1.1)
 
 # --------------------------------------------------------------------------------------------------------
 # Library switches

README.md

@@ -63,7 +63,7 @@ We recommend using [CPM.cmake](https://github.com/cpm-cmake/CPM.cmake) to consum
 * Installation with CPM
 
   ```cmake
-  CPMAddPackage("gh:viennatools/[email protected].0")
+  CPMAddPackage("gh:viennatools/[email protected].1")
   ```
 
 * With a local installation

include/viennaray/raySource.hpp

@@ -3,7 +3,7 @@
 #include <rayRNG.hpp>
 #include <rayUtil.hpp>
 
-template <typename NumericType, int D> class raySource {
+template <typename NumericType> class raySource {
 public:
   virtual ~raySource() = default;
 

include/viennaray/raySourceGrid.hpp

@@ -3,7 +3,7 @@
 #include <raySource.hpp>
 
 template <typename NumericType, int D>
-class raySourceGrid : public raySource<NumericType, D> {
+class raySourceGrid : public raySource<NumericType> {
 public:
   raySourceGrid(std::vector<rayTriple<NumericType>> &sourceGrid,
                 NumericType cosinePower,

include/viennaray/raySourceRandom.hpp

@@ -3,7 +3,7 @@
 #include <raySource.hpp>
 
 template <typename NumericType, int D>
-class raySourceRandom : public raySource<NumericType, D> {
+class raySourceRandom : public raySource<NumericType> {
   using boundingBoxType = rayPair<rayTriple<NumericType>>;
 
 public:

include/viennaray/rayTrace.hpp

@@ -73,7 +73,7 @@ template <class NumericType, int D> class rayTrace {
             std::enable_if_t<std::is_base_of_v<rayAbstractParticle<NumericType>,
                                                ParticleType>,
                              bool> = true>
-  void setParticleType(std::unique_ptr<ParticleType> &particle) {
+  void setParticleType(std::unique_ptr<ParticleType> const &particle) {
     pParticle_ = particle->clone();
   }
 
@@ -125,8 +125,8 @@ template <class NumericType, int D> class rayTrace {
   /// Set a custom source for the ray tracing. Per default a random source is
   /// set up. The source has to be a user defined object that has to interface
   /// the raySource class.
-  void setSource(std::unique_ptr<raySource<NumericType, D>> source) {
-    pSource_ = std::move(source);
+  void setSource(std::shared_ptr<raySource<NumericType>> source) {
+    pSource_ = source;
   }
 
   /// Reset the source to the default random source.
@@ -383,7 +383,7 @@ template <class NumericType, int D> class rayTrace {
 
   rayGeometry<NumericType, D> geometry_;
   std::unique_ptr<rayAbstractParticle<NumericType>> pParticle_ = nullptr;
-  std::unique_ptr<raySource<NumericType, D>> pSource_ = nullptr;
+  std::shared_ptr<raySource<NumericType>> pSource_ = nullptr;
 
   size_t numberOfRaysPerPoint_ = 1000;
   size_t numberOfRaysFixed_ = 0;

include/viennaray/rayTraceKernel.hpp

@@ -13,15 +13,15 @@ template <typename NumericType, int D> class rayTraceKernel {
 public:
   rayTraceKernel(RTCDevice &device, rayGeometry<NumericType, D> &geometry,
                  rayBoundary<NumericType, D> &boundary,
-                 std::unique_ptr<raySource<NumericType, D>> source,
+                 std::shared_ptr<raySource<NumericType>> source,
                  std::unique_ptr<rayAbstractParticle<NumericType>> &particle,
                  rayDataLog<NumericType> &dataLog, const size_t numRaysPerPoint,
                  const size_t numRaysFixed, const bool useRandomSeed,
                  const bool calcFlux, const size_t runNumber,
                  rayHitCounter<NumericType> &hitCounter,
                  rayTraceInfo &traceInfo)
       : device_(device), geometry_(geometry), boundary_(boundary),
-        pSource_(std::move(source)), pParticle_(particle->clone()),
+        pSource_(source), pParticle_(particle->clone()),
         numRays_(numRaysFixed == 0 ? pSource_->getNumPoints() * numRaysPerPoint
                                    : numRaysFixed),
         useRandomSeeds_(useRandomSeed), runNumber_(runNumber),
@@ -85,7 +85,8 @@ template <typename NumericType, int D> class rayTraceKernel {
 
     auto time = rayInternal::timeStampNow<std::chrono::milliseconds>();
 
-#pragma omp parallel reduction(+ : geohitc, nongeohitc, totaltraces, particlehitc)  \
+#pragma omp parallel reduction(+ : geohitc, nongeohitc, totaltraces,           \
+                                   particlehitc)                               \
     shared(threadLocalData, threadLocalHitCounter)
     {
       rtcJoinCommitScene(rtcScene);
@@ -600,7 +601,7 @@ template <typename NumericType, int D> class rayTraceKernel {
 
   rayGeometry<NumericType, D> &geometry_;
   rayBoundary<NumericType, D> const &boundary_;
-  std::unique_ptr<raySource<NumericType, D>> const pSource_;
+  std::shared_ptr<raySource<NumericType>> const pSource_;
   std::unique_ptr<rayAbstractParticle<NumericType>> const pParticle_;
 
   const long long numRays_;

tests/traceInterface/traceInterface.cpp

@@ -3,7 +3,7 @@
 #include <rayTrace.hpp>
 
 template <typename NumericType, int D>
-class MySource : public raySource<NumericType, D> {
+class MySource : public raySource<NumericType> {
 public:
   MySource() {}
 
@@ -45,8 +45,8 @@ int main() {
   rayTracer.setUseRandomSeeds(false);
   rayTracer.setMaterialIds(matIds);
 
-  auto mySource = std::make_unique<MySource<NumericType, D>>();
-  rayTracer.setSource(std::move(mySource));
+  auto mySource = std::make_shared<MySource<NumericType, D>>();
+  rayTracer.setSource(mySource);
   rayTracer.resetSource();
 
   rayTracer.apply();