const correctness, pointeurs, reglage des virtuals functions, début du

debogage
etiennedeg · Feb 10, 2018 · af1627a · af1627a
1 parent 1b102ba
commit af1627a
Show file tree

Hide file tree

Showing 30 changed files with 232 additions and 329 deletions.
diff --git a/.autotools b/.autotools
diff --git a/.cproject b/.cproject
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+/Debug/
diff --git a/.project b/.project
@@ -5,11 +5,6 @@
 	<projects>
 	</projects>
 	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.cdt.autotools.core.genmakebuilderV2</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
 			<triggers>clean,full,incremental,</triggers>
@@ -28,6 +23,5 @@
 		<nature>org.eclipse.cdt.core.ccnature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
-		<nature>org.eclipse.cdt.autotools.core.autotoolsNatureV2</nature>
 	</natures>
 </projectDescription>
diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <project>
-	<configuration id="cdt.managedbuild.config.gnu.cross.exe.debug.1293421261" name="Debug">
+	<configuration id="cdt.managedbuild.config.gnu.cross.exe.debug.1952959546" name="Debug">
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
@@ -11,7 +11,7 @@
 			</provider>
 		</extension>
 	</configuration>
-	<configuration id="cdt.managedbuild.config.gnu.cross.exe.release.897411868" name="Release">
+	<configuration id="cdt.managedbuild.config.gnu.cross.exe.release.1157127818" name="Release">
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>

diff --git a/.settings/org.eclipse.cdt.managedbuilder.core.prefs b/.settings/org.eclipse.cdt.managedbuilder.core.prefs
@@ -1,33 +1,13 @@
 eclipse.preferences.version=1
-environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.debug.1293421261/CPATH/delimiter=;
-environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.debug.1293421261/CPATH/operation=remove
-environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.debug.1293421261/CPLUS_INCLUDE_PATH/delimiter=;
-environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.debug.1293421261/CPLUS_INCLUDE_PATH/operation=remove
-environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.debug.1293421261/C_INCLUDE_PATH/delimiter=;
-environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.debug.1293421261/C_INCLUDE_PATH/operation=remove
-environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.debug.1293421261/append=true
-environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.debug.1293421261/appendContributed=true
-environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.debug.267591927/CPATH/delimiter=\:
-environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.debug.267591927/CPATH/operation=remove
-environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.debug.267591927/CPLUS_INCLUDE_PATH/delimiter=\:
-environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.debug.267591927/CPLUS_INCLUDE_PATH/operation=remove
-environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.debug.267591927/C_INCLUDE_PATH/delimiter=\:
-environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.debug.267591927/C_INCLUDE_PATH/operation=remove
-environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.debug.267591927/append=true
-environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.debug.267591927/appendContributed=true
-environment/buildEnvironmentInclude/org.eclipse.linuxtools.cdt.autotools.core.configuration.build.1233039808/CPATH/delimiter=;
-environment/buildEnvironmentInclude/org.eclipse.linuxtools.cdt.autotools.core.configuration.build.1233039808/CPATH/operation=remove
-environment/buildEnvironmentInclude/org.eclipse.linuxtools.cdt.autotools.core.configuration.build.1233039808/CPLUS_INCLUDE_PATH/delimiter=;
-environment/buildEnvironmentInclude/org.eclipse.linuxtools.cdt.autotools.core.configuration.build.1233039808/CPLUS_INCLUDE_PATH/operation=remove
-environment/buildEnvironmentInclude/org.eclipse.linuxtools.cdt.autotools.core.configuration.build.1233039808/C_INCLUDE_PATH/delimiter=;
-environment/buildEnvironmentInclude/org.eclipse.linuxtools.cdt.autotools.core.configuration.build.1233039808/C_INCLUDE_PATH/operation=remove
-environment/buildEnvironmentInclude/org.eclipse.linuxtools.cdt.autotools.core.configuration.build.1233039808/append=true
-environment/buildEnvironmentInclude/org.eclipse.linuxtools.cdt.autotools.core.configuration.build.1233039808/appendContributed=true
-environment/buildEnvironmentLibrary/cdt.managedbuild.config.gnu.cross.exe.debug.1293421261/LIBRARY_PATH/delimiter=;
-environment/buildEnvironmentLibrary/cdt.managedbuild.config.gnu.cross.exe.debug.1293421261/LIBRARY_PATH/operation=remove
-environment/buildEnvironmentLibrary/cdt.managedbuild.config.gnu.cross.exe.debug.1293421261/append=true
-environment/buildEnvironmentLibrary/cdt.managedbuild.config.gnu.cross.exe.debug.1293421261/appendContributed=true
-environment/buildEnvironmentLibrary/cdt.managedbuild.config.gnu.cross.exe.debug.267591927/LIBRARY_PATH/delimiter=\:
-environment/buildEnvironmentLibrary/cdt.managedbuild.config.gnu.cross.exe.debug.267591927/LIBRARY_PATH/operation=remove
-environment/buildEnvironmentLibrary/cdt.managedbuild.config.gnu.cross.exe.debug.267591927/append=true
-environment/buildEnvironmentLibrary/cdt.managedbuild.config.gnu.cross.exe.debug.267591927/appendContributed=true
+environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.debug.1952959546/CPATH/delimiter=;
+environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.debug.1952959546/CPATH/operation=remove
+environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.debug.1952959546/CPLUS_INCLUDE_PATH/delimiter=;
+environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.debug.1952959546/CPLUS_INCLUDE_PATH/operation=remove
+environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.debug.1952959546/C_INCLUDE_PATH/delimiter=;
+environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.debug.1952959546/C_INCLUDE_PATH/operation=remove
+environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.debug.1952959546/append=true
+environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.cross.exe.debug.1952959546/appendContributed=true
+environment/buildEnvironmentLibrary/cdt.managedbuild.config.gnu.cross.exe.debug.1952959546/LIBRARY_PATH/delimiter=;
+environment/buildEnvironmentLibrary/cdt.managedbuild.config.gnu.cross.exe.debug.1952959546/LIBRARY_PATH/operation=remove
+environment/buildEnvironmentLibrary/cdt.managedbuild.config.gnu.cross.exe.debug.1952959546/append=true
+environment/buildEnvironmentLibrary/cdt.managedbuild.config.gnu.cross.exe.debug.1952959546/appendContributed=true
diff --git a/Debug/.gitignore b/Debug/.gitignore
diff --git a/src/AGContreStratFixe.cpp b/src/AGContreStratFixe.cpp
@@ -10,20 +10,20 @@
 #include "AGContreStratFixe.h"
 
 
-AGContreStratFixe::AGContreStratFixe(Strategie &uneStrategie, Jeu &unJeu, int uneTaillePop, int unNombreManches, int uneTailleMemoire):AlgoGenetiqueTDJ(unJeu, uneTaillePop, unNombreManches, uneTailleMemoire), m_strategie(uneStrategie) {
-
+AGContreStratFixe::AGContreStratFixe(Strategie &uneStrategie, const Jeu &unJeu, const int uneTaillePop, const int unNombreManches, const int uneTailleMemoire):AlgoGenetiqueTDJ(unJeu, uneTaillePop, unNombreManches, uneTailleMemoire) {
+	p_strategie = &uneStrategie;
 }
 
 AGContreStratFixe::~AGContreStratFixe() {
 	// TODO Auto-generated destructor stub
 }
 
-Strategie AGContreStratFixe::getStrategie(){
-	return m_strategie;
+Strategie *AGContreStratFixe::getStrategie(){
+	return p_strategie;
 }
 
 void AGContreStratFixe::setStrategie(Strategie &uneStrategie){
-	m_strategie = uneStrategie;
+	p_strategie = &uneStrategie;
 }
 
 void AGContreStratFixe::selection(){
@@ -32,8 +32,8 @@ void AGContreStratFixe::selection(){
 	for (int i = 0; i < p; ++i){
 		IndividuTDJ individu = getIndividu(i);
 		StrategieEvo strat1 = individu.getStrategie();
-		Strategie strat2 = getStrategie();
-		std::vector<double> eval = fitnessFunction(strat1, strat2);
+		Strategie *strat2 = getStrategie();
+		std::vector<double> eval = fitnessFunction(strat1, *strat2);
 		individu.setGain(eval.at(0));
 		triIndividu.push_back(individu);
 	}

diff --git a/src/AGContreStratFixe.h b/src/AGContreStratFixe.h
@@ -11,19 +11,18 @@
 #include "Strategie.h"
 #include "AlgoGenetiqueTDJ.h"
 
-class Strategie;
 class Jeu;
 
 class AGContreStratFixe : public AlgoGenetiqueTDJ{
-private:
-	Strategie m_strategie;
+protected:
+	Strategie *p_strategie;
 
 public:
-	AGContreStratFixe(Strategie &uneStrategie, Jeu &unJeu, int uneTaillePop, int unNombreManches, int uneTailleMemoire);
+	AGContreStratFixe(Strategie &uneStrategie, const Jeu &unJeu, const int uneTaillePop, const int unNombreManches, const int uneTailleMemoire);
 	virtual ~AGContreStratFixe();
-	Strategie getStrategie();
+	Strategie *getStrategie();
 	void setStrategie(Strategie &uneStrategie);
-private:
+protected:
 	void selection();
 };
 

diff --git a/src/AGNoStrat.cpp b/src/AGNoStrat.cpp
diff --git a/src/AGNoStrat.h b/src/AGNoStrat.h
diff --git a/src/AlgoGenetique.cpp b/src/AlgoGenetique.cpp
@@ -8,6 +8,7 @@
 #include "AlgoGenetique.h"
 
 AlgoGenetique::AlgoGenetique(){
+
 }
 
 AlgoGenetique::~AlgoGenetique(){
@@ -19,19 +20,35 @@ void AlgoGenetique::doOneGeneration(){
 	mutation();
 }
 
-void AlgoGenetique::doGenerations(int n){
+void AlgoGenetique::doGenerations(const int n){
 	for (int i = 0; i < n; ++i){
 		selection();
 		croisement();
 		mutation();
 	}
 }
 
-int AlgoGenetique::getTaillePop(){
+int AlgoGenetique::getTaillePop() const{
 	return m_population.size();
 }
 
-Individu AlgoGenetique::getPop(int unIndividu){
+Individu AlgoGenetique::getPop(const int unIndividu) const{
 	return m_population.at(unIndividu);
 }
 
+
+void AlgoGenetique::genPopulation(){
+
+}
+
+void AlgoGenetique::selection(){
+
+}
+
+void AlgoGenetique::croisement(){
+
+}
+
+void AlgoGenetique::mutation(){
+
+}
diff --git a/src/AlgoGenetique.h b/src/AlgoGenetique.h
@@ -13,20 +13,20 @@
 #include "Individu.h"
 
 class AlgoGenetique {
-private:
+protected:
 	std::vector<Individu> m_population;
 
 public:
 	AlgoGenetique();
 	virtual ~AlgoGenetique();
 
 	void doOneGeneration();
-	void doGenerations(int n);
+	void doGenerations(const int n);
 
-	int getTaillePop();
-	Individu getPop(int unIndividu);
+	int getTaillePop() const;
+	Individu getPop(const int unIndividu) const;
 
-private:
+protected:
 	virtual void genPopulation();
 	virtual void selection();
 	virtual void croisement();