Model: give sweep parameter to sweepParams callback

main.cpp

@@ -37,7 +37,7 @@ void runSingle()
 	std::cout<<"time taken: "<<duration.count()<<" us"<<'\n';
 }
 
-void sweepCb(std::vector<Model::DataPoint>& data)
+void sweepCb(std::vector<Model::DataPoint>& data, const std::vector<double>& parameters)
 {
 	static size_t i = 0;
 	++i;

model.cpp

@@ -245,7 +245,7 @@ std::vector<Model::DataPoint> Model::sweep(const Range& omega)
 	return results;
 }
 
-bool Model::sweepParams(const std::vector<Range>& componantRanges, const Range& omega, std::function<void(std::vector<DataPoint>&)> dataCb)
+bool Model::sweepParams(const std::vector<Range>& componantRanges, const Range& omega, std::function<void(std::vector<DataPoint>&, const std::vector<double>&)> dataCb)
 {
 	size_t parametersCount = getFlatParametersCount();
 	if(componantRanges.size() != parametersCount)
@@ -294,7 +294,7 @@ bool Model::sweepParams(const std::vector<Range>& componantRanges, const Range&
 				break;
 		}
 		std::vector<DataPoint> result = sweep(omega);
-		dataCb(result);
+		dataCb(result, currentParam);
 	}
 
 	return true;

model.h

@@ -60,7 +60,7 @@ public:
 	Model(const std::string& str);
 	DataPoint execute(double omaga);
 	std::vector<DataPoint> sweep(const Range& omega);
-	bool sweepParams(const std::vector<Range>& componantRanges, const Range& omega, std::function<void(std::vector<DataPoint>&)> dataCb);
+	bool sweepParams(const std::vector<Range>& componantRanges, const Range& omega, std::function<void(std::vector<DataPoint>&, const std::vector<double>&)> dataCb);
 	std::string getModelStr();
 	std::vector<Componant*> getFlatComponants();
 	size_t getFlatParametersCount();