added todo, removed comments

mlmc/src/generators/algorithms/HybridFluxGenerator.cpp

@@ -16,6 +16,8 @@ void HybridFaceNormalFluxGenerator::createPDESolver() {
         Create(meshes);
 }
 
+// Todo delete sample solutions
+
 void HybridFaceNormalFluxGenerator::drawSample(const SampleID &id) {
     pdeSolver->DrawSample(id);
     solutionFaceValues = new SampleSolution(pdeSolver->MGraphs(), id);
@@ -32,11 +34,9 @@ Scalar HybridFaceNormalFluxGenerator::EvalSample(int face, const cell &c) {
 }
 
 HybridFaceNormalFluxGenerator::~HybridFaceNormalFluxGenerator() {
-//    delete cellMGraphs;
-    delete pdeSolver;
-    delete solutionFaceValues;
-    delete solutionFaceFlux;
-//    delete solutionCellFlux;
+    if (!pdeSolver) delete pdeSolver;
+    if (!solutionFaceValues) delete solutionFaceValues;
+    if (!solutionFaceFlux) delete solutionFaceFlux;
 }
 
 VectorField HybridCellFluxGenerator::EvalSample(const cell &c) {

mlmc/src/generators/algorithms/HybridFluxGenerator.hpp

@@ -9,23 +9,17 @@ class PDESolver;
 
 class HybridFaceNormalFluxGenerator : public SampleGenerator<Scalar> {
 private:
-//    MatrixGraphs *cellMGraphs;
-
     void createPDESolver();
 
     void drawSample(const SampleID &id) override;
 
 public:
-    // Created in constructor
     PDESolver *pdeSolver;
 
-    // Created in drawSample
     SampleSolution *solutionFaceValues;
 
     SampleSolution *solutionFaceFlux;
 
-//    SampleSolution *solutionCellFlux;
-
     HybridFaceNormalFluxGenerator(Meshes &meshes) :
         SampleGenerator(meshes) {
         createPDESolver();
@@ -46,11 +40,9 @@ class HybridCellFluxGenerator : public SampleGenerator<VectorField> {
     void drawSample(const SampleID &id) override {};
 
 public:
-    HybridCellFluxGenerator(Meshes &meshes,
-                            HybridFaceNormalFluxGenerator &generator) :
+    HybridCellFluxGenerator(Meshes &meshes, HybridFaceNormalFluxGenerator &generator) :
         SampleGenerator(meshes),
-        generator(generator) {
-    }
+        generator(generator) {}
 
     VectorField EvalSample(const cell &c) override;
 
@@ -58,4 +50,5 @@ public:
         return "HybridCellFluxGenerator";
     }
 };
+
 #endif //HYBRIDFLUXGENERATOR_HPP