Commit aa104ca1 authored by Brandon Reid's avatar Brandon Reid

autosave

parent bd8d1f68
......@@ -10,8 +10,6 @@ using namespace std;
pair<double, double> longAndLat () {
ifstream fin;
fin.open("countries.txt");
ifstream filestream("countries.txt");
print("Print this", filestream);
//variables
vector <pair<double, double>> coordinateVector;
......@@ -24,7 +22,9 @@ pair<double, double> longAndLat () {
exit(1);
}
while(!fin.eof()) {
pair<double,double> tempPair;
getline(fin, placeName, '.');
getline(fin, tempPair.first, '.');
......@@ -33,10 +33,6 @@ pair<double, double> longAndLat () {
tempMap.emplace(placeName, tempPair);
placeName.clear();
}
//<<<<<<< HEAD
return tempMap;
}
//=======
// TODO Print the cities
......@@ -57,5 +53,4 @@ pair<double, double> longAndLat () {
return coordinateVector.at(cityNum - 1);
}
//>>>>>>> 37773ebd81c48909890df464721d8b1870634f96
}
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment