spell out Distributions_t

GUI/coregui/Models/TransformFromDomain.cpp

@@ -246,7 +246,7 @@ void TransformFromDomain::setGISASBeamItem(BeamItem* beam_item, const GISASSimul
     beam_item->setAzimuthalAngle(Units::rad2deg(beam.direction().phi()));
 
     // distribution parameters
-    const DistributionHandler::Distributions_t distributions =
+    const std::vector<ParameterDistribution> distributions =
         simulation.getDistributionHandler().getDistributions();
     for (size_t i = 0; i < distributions.size(); ++i) {
         addDistributionToBeamItem("Wavelength", BeamItem::P_WAVELENGTH, distributions[i],

Param/Distrib/DistributionHandler.cpp

@@ -77,7 +77,7 @@ void DistributionHandler::setParameterToMeans(ParameterPool* p_parameter_pool) c
     }
 }
 
-const DistributionHandler::Distributions_t& DistributionHandler::getDistributions() const
+const std::vector<ParameterDistribution>& DistributionHandler::getDistributions() const
 {
     return m_distributions;
 }

Param/Distrib/DistributionHandler.h

@@ -28,7 +28,6 @@
 //! @ingroup algorithms_internal
 class DistributionHandler : public IParametricComponent {
 public:
-    typedef std::vector<ParameterDistribution> Distributions_t;
     DistributionHandler();
     virtual ~DistributionHandler();
 
@@ -53,11 +52,11 @@ public:
     //! Sets mean distribution values to the parameter pool.
     void setParameterToMeans(ParameterPool* p_parameter_pool) const;
 
-    const Distributions_t& getDistributions() const;
+    const std::vector<ParameterDistribution>& getDistributions() const;
 
 private:
     size_t m_nbr_combinations;
-    Distributions_t m_distributions;
+    std::vector<ParameterDistribution> m_distributions;
     std::vector<std::vector<ParameterSample>> m_cached_samples;
 };
 

Tests/UnitTests/Core/Parameters/DistributionHandlerTest.cpp

@@ -23,7 +23,7 @@ TEST_F(DistributionHandlerTest, DistributionHandlerConstructor)
 
     EXPECT_EQ(size_t(2), handler.getTotalNumberOfSamples());
 
-    const DistributionHandler::Distributions_t& distr = handler.getDistributions();
+    const std::vector<ParameterDistribution>& distr = handler.getDistributions();
     ParameterDistribution distribution1 = distr[0];
     EXPECT_EQ(distribution1.getNbrSamples(), size_t(2));
     EXPECT_EQ(distribution1.getSigmaFactor(), 1.0);