Change reset function to correspond to gegelati changes

gegelati · Jan 12, 2024 · 419c60b · 419c60b
1 parent 5469dbf
commit 419c60b
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 8 deletions.
diff --git a/mnist/src/mnist.cpp b/mnist/src/mnist.cpp
@@ -55,7 +55,7 @@ void MNIST::doAction(uint64_t actionID)
 	this->changeCurrentImage();
 }
 
-void MNIST::reset(size_t seed, Learn::LearningMode mode)
+void MNIST::reset(size_t seed, Learn::LearningMode mode, uint16_t iterationNumber, uint64_t generationNumber)
 {
 	// Reset the classificationTable
 	ClassificationLearningEnvironment::reset(seed);

diff --git a/mnist/src/mnist.h b/mnist/src/mnist.h
@@ -49,7 +49,8 @@ class MNIST : public Learn::ClassificationLearningEnvironment {
 	virtual void doAction(uint64_t actionID) override;
 
 	/// Inherited via LearningEnvironment
-	virtual void reset(size_t seed = 0, Learn::LearningMode mode = Learn::LearningMode::TRAINING) override;
+	virtual void reset(size_t seed = 0, Learn::LearningMode mode = Learn::LearningMode::TRAINING,
+					   uint16_t iterationNumber = 0, uint64_t generationNumber = 0) override;
 
 	/// Inherited via LearningEnvironment
 	virtual std::vector<std::reference_wrapper<const Data::DataHandler>> getDataSources() override;

diff --git a/pendulum/src/Learn/pendulum.cpp b/pendulum/src/Learn/pendulum.cpp
@@ -39,7 +39,7 @@ std::vector<std::reference_wrapper<const Data::DataHandler>> Pendulum::getDataSo
 	return result;
 }
 
-void Pendulum::reset(size_t seed, Learn::LearningMode mode)
+void Pendulum::reset(size_t seed, Learn::LearningMode mode, uint16_t iterationNumber, uint64_t generationNumber)
 {
 	// Create seed from seed and mode
 	size_t hash_seed = Data::Hash<size_t>()(seed) ^ Data::Hash<Learn::LearningMode>()(mode);

diff --git a/pendulum/src/Learn/pendulum.h b/pendulum/src/Learn/pendulum.h
@@ -90,7 +90,8 @@ class Pendulum : public Learn::LearningEnvironment
 	virtual std::vector<std::reference_wrapper<const Data::DataHandler>> getDataSources() override;
 
 	/// Inherited via LearningEnvironment
-	virtual void reset(size_t seed = 0, Learn::LearningMode mode = Learn::LearningMode::TRAINING) override;
+	virtual void reset(size_t seed = 0, Learn::LearningMode mode = Learn::LearningMode::TRAINING,
+					   uint16_t iterationNumber = 0, uint64_t generationNumber = 0) override;
 
 	/**
 	* \brief Get the action from its associated ID.

diff --git a/stickgame/src/Learn/stickGameAdversarial.cpp b/stickgame/src/Learn/stickGameAdversarial.cpp
@@ -102,7 +102,7 @@ void StickGameAdversarial::doAction(uint64_t actionID)
     }
 }
 
-void StickGameAdversarial::reset(size_t seed, Learn::LearningMode mode)
+void StickGameAdversarial::reset(size_t seed, Learn::LearningMode mode, uint16_t iterationNumber, uint64_t generationNumber)
 {
     // Create seed from seed and mode
     size_t hash_seed =

diff --git a/stickgame/src/Learn/stickGameAdversarial.h b/stickgame/src/Learn/stickGameAdversarial.h
@@ -120,7 +120,9 @@ class StickGameAdversarial : public Learn::AdversarialLearningEnvironment
     // Inherited via LearningEnvironment
     virtual void reset(
         size_t seed = 0,
-        Learn::LearningMode mode = Learn::LearningMode::TRAINING) override;
+        Learn::LearningMode mode = Learn::LearningMode::TRAINING,
+        uint16_t iterationNumber = 0,
+        uint64_t generationNumber = 0) override;
 
     // Inherited via LearningEnvironment
     virtual std::vector<std::reference_wrapper<const Data::DataHandler>>

diff --git a/tic-tac-toe/src/Learn/TicTacToe.cpp b/tic-tac-toe/src/Learn/TicTacToe.cpp
@@ -98,7 +98,7 @@ void TicTacToe::randomPlay(double symbolOfPlayer) {
     this->board.setDataAt(typeid(double), i, symbolOfPlayer);
 }
 
-void TicTacToe::reset(size_t seed, Learn::LearningMode mode) {
+void TicTacToe::reset(size_t seed, Learn::LearningMode mode, uint16_t iterationNumber, uint64_t generationNumber) {
     // Create seed from seed and mode
     size_t hash_seed = Data::Hash<size_t>()(seed) ^Data::Hash<Learn::LearningMode>()(mode);
     this->rng.setSeed(hash_seed);

diff --git a/tic-tac-toe/src/Learn/TicTacToe.h b/tic-tac-toe/src/Learn/TicTacToe.h
@@ -94,7 +94,9 @@ class TicTacToe : public Learn::AdversarialLearningEnvironment {
   /// Inherited via LearningEnvironment
   virtual void
   reset(size_t seed = 0,
-        Learn::LearningMode mode = Learn::LearningMode::TRAINING) override;
+        Learn::LearningMode mode = Learn::LearningMode::TRAINING,
+        uint16_t iterationNumber = 0,
+        uint64_t generationNumber = 0) override;
 
   /// Inherited via LearningEnvironment
   virtual std::vector<std::reference_wrapper<const Data::DataHandler>>