Development (#2)

* V0.4 - Lazy Constraint Callback

* Updated README.md

* V0.5 - Added arguments support and writing results to a text file\nCan now be massively launched from a command line interface, all results will be printed to Results.txt

Author: marcb152

.gitignore

@@ -360,4 +360,5 @@ MigrationBackup/
 .ionide/
 
 # Fody - auto-generated XML schema
-FodyWeavers.xsd
+FodyWeavers.xsd
+/TIPEcppTest1/model.lp

README.md

@@ -1 +1,14 @@
-# TIPEcppTest1
+# TIPE: Implementation of a TSP solver using IBM's CPLEX and Concert in C++
+
+This implementation aims to reproduce and implement the algorithms present in the paper *"Optimisation des livraisons urbaines avec drones et véhicules en parallèle"*, published by *Gertrude Raïssa Mbiadou Saleu*
+This paper is freely available here: https://tel.archives-ouvertes.fr/tel-03554311
+
+> Gertrude Raïssa Mbiadou Saleu. Optimisation des livraisons urbaines avec drones et véhicules en parallèle. Other [cs.OH]. Université Clermont Auvergne, 2021. English. ffNNT : 2021UCFAC009ff.fftel-03554311f
+
+# Important notice
+
+This project requires CPLEX Studio to be installed to run
+This projects needs to be configured in order to run cplex and concert libraries
+
+As I am learning C++ on the way with this project, some parts of the code may not be accurate, I provide it "as-is" for you to use
+Thanks for your understanding

TIPEcppTest1/FileManager.cpp

@@ -38,7 +38,7 @@ vector<vector<string>> FileManager::read_file(string filename, bool EnableCout)
 			}
 			else if (wordNum != wordList.size())
 			{
-				cout << "ERROR: File word count per line is not consistent!" << endl;
+				cerr << "ERROR: File word count per line is not consistent!" << endl;
 			}
 
 			if (EnableCout) { cout << myLine << endl; }
@@ -48,6 +48,11 @@ vector<vector<string>> FileManager::read_file(string filename, bool EnableCout)
 		return lineList;
 		file.close();
 	}
+	else
+	{
+		cerr << "ERROR: Unable to read file" << endl;
+		return vector<vector<string>> {};
+	}
 }
 
 float** FileManager::read_standardized_csv(vector<vector<string>> lines, bool EnableCout)
@@ -63,7 +68,7 @@ float** FileManager::read_standardized_csv(vector<vector<string>> lines, bool En
 	{
 		int i = std::stoi(lines[p][0]);
 		int j = std::stoi(lines[p][1]);
-		Distance[i][j] = std::stod(lines[p][3]);
+		Distance[i][j] = std::stof(lines[p][3]);
 		if (EnableCout)
 		{
 			cout << "i: " << i << " j: " << j << " dist: " << std::stod(lines[p][3]) << endl;

TIPEcppTest1/FileManager.h

@@ -14,13 +14,13 @@ static class FileManager
 	/// <param name="filename">The path to find the csv file</param>
 	/// <param name="EnableCout">Enable debug output to console</param>
 	/// <returns>A list of lines containing a list of words</returns>
-	static vector<vector<string>> read_file(string filename, bool EnableCout);
+	static vector<vector<string>> read_file(string filename, bool EnableCout = false);
 
 	/// <summary>
 	/// This is a parser, parses the wanted csv file to retrieve the wanted matrices
 	/// </summary>
 	/// <param name="lines">The csv files, already organized</param>
 	/// <param name="EnableCout">Enable debug output to console</param>
 	/// <returns>A matrix containing the data of the csv</returns>
-	static float** read_standardized_csv(vector<vector<string>> lines, bool EnableCout);
+	static float** read_standardized_csv(vector<vector<string>> lines, bool EnableCout = false);
 };