diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index 55cf3823a..78a9df7d0 100644 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -21,7 +21,71 @@ "compilerPath": "/usr/bin/clang", "cStandard": "c17", "cppStandard": "c++17", - "intelliSenseMode": "macos-clang-arm64" + "intelliSenseMode": "macos-clang-arm64", + "compilerPathInCppPropertiesJson": "/usr/bin/gcc", + "mergeConfigurations": false, + "browse": { + "path": [ + "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include", + "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/14.0.3/include", + "${workspaceFolder}/**", + "/usr/local/include", + "/usr/local/opt/boost/include", + "/usr/local/opt/gdal/include", + "/usr/local/opt/boost/include", + "${workspaceFolder}/BuildTools/macosx/libraries/include", + "${workspaceFolder}/BuildTools/macosx/libraries/include/wx-3.2", + "${workspaceFolder}/BuildTools/macosx/libraries/lib/wx/include/osx_cocoa-unicode-3.2", + "${workspaceFolder}" + ], + "limitSymbolsToIncludedHeaders": true + } + }, + { + "name": "Linux", + "includePath": [ + "${workspaceFolder}/**", + "${workspaceFolder}/BuildTools/ubuntu/libraries/lib/wx/include/gtk3-unicode-static-3.1", + "${workspaceFolder}/BuildTools/ubuntu/libraries/include", + "${workspaceFolder}/BuildTools/ubuntu/libraries/include/wx-3.1", + "${workspaceFolder}/BuildTools/ubuntu/temp/boost", + "/usr/include/gdal", + "/usr/include", + "/usr/include/c++/11", + "/usr/include/x86_64-linux-gnu/c++/11", + "${workspaceFolder}/BuildTools/ubuntu/temp/eigen3", + "${workspaceFolder}/BuildTools/ubuntu/temp/spectra/include" + ], + "defines": [], + "compilerPath": "/usr/bin/gcc", + "intelliSenseMode": "linux-gcc-x64", + "compilerArgs": [ + "-D_FILE_OFFSET_BITS=64", + "-DwxDEBUG_LEVEL=0", + "-D__WXGTK__", + "-D__PROJ6__", + "-std=gnu++14" + ], + "cppStandard": "c++17", + "compilerPathInCppPropertiesJson": "/usr/bin/gcc", + "cStandard": "c11", + "mergeConfigurations": false, + "browse": { + "path": [ + "${workspaceFolder}/**", + "${workspaceFolder}/BuildTools/ubuntu/libraries/lib/wx/include/gtk3-unicode-static-3.1", + "${workspaceFolder}/BuildTools/ubuntu/libraries/include", + "${workspaceFolder}/BuildTools/ubuntu/libraries/include/wx-3.1", + "${workspaceFolder}/BuildTools/ubuntu/temp/boost", + "/usr/include/gdal", + "/usr/include", + "/usr/include/c++/11", + "${workspaceFolder}/BuildTools/ubuntu/temp/eigen3", + "${workspaceFolder}/BuildTools/ubuntu/temp/spectra/include", + "${workspaceFolder}" + ], + "limitSymbolsToIncludedHeaders": true + } } ], "version": 4 diff --git a/.vscode/launch.json b/.vscode/launch.json index 87c7b9b9d..f76e5241f 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -1,46 +1,53 @@ { - // Use IntelliSense to learn about possible attributes. - // Hover to view descriptions of existing attributes. - // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 - "version": "0.2.0", - "configurations": [ - {"name":"Python: Current File","type":"python","request":"launch","program":"${file}","console":"integratedTerminal"}, + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "name": "Python: Current File", + "type": "python", + "request": "launch", + "program": "${file}", + "console": "integratedTerminal", + "justMyCode": true + }, + { + "name": "(gdb) Launch", + "type": "cppdbg", + "request": "launch", + "program": "${workspaceFolder}/BuildTools/ubuntu/build/GeoDa", + "args": [], + "stopAtEntry": false, + "cwd": "${workspaceFolder}", + "environment": [ { - "name": "(gdb) Launch", - "type": "cppdbg", - "request": "launch", - "program": "${workspaceFolder}/BuildTools/ubuntu/build/GeoDa", - "args": [], - "stopAtEntry": false, - "cwd": "${workspaceFolder}", - "environment": [ - { - "name": "LD_LIBRARY_PATH", - "value": "${workspaceFolder}/BuildTools/ubuntu/build/plugins" - } - ], - "externalConsole": true, - "MIMode": "gdb", - "setupCommands": [ - { - "description": "Enable pretty-printing for gdb", - "text": "-enable-pretty-printing", - "ignoreFailures": true - } - ] - }, + "name": "LD_LIBRARY_PATH", + "value": "${workspaceFolder}/BuildTools/ubuntu/build/plugins" + } + ], + "externalConsole": true, + "MIMode": "gdb", + "setupCommands": [ { - "name": "(macos llvm) Launch", - "type": "cppdbg", - "request": "launch", - "program": "${workspaceFolder}/BuildTools/macosx/debug/GeoDa", - "args": [], - "stopAtEntry": true, - "cwd": "${workspaceFolder}", - "environment": [], - "externalConsole": false, - "MIMode": "lldb", - "preLaunchTask": "clang++ build active file" + "description": "Enable pretty-printing for gdb", + "text": "-enable-pretty-printing", + "ignoreFailures": true } - ] -} \ No newline at end of file + ] + }, + { + "name": "(macos llvm) Launch", + "type": "cppdbg", + "request": "launch", + "program": "${workspaceFolder}/BuildTools/macosx/debug/GeoDa", + "args": [], + "stopAtEntry": true, + "cwd": "${workspaceFolder}", + "environment": [], + "externalConsole": false, + "MIMode": "lldb", + "preLaunchTask": "clang++ build active file" + } + ] +} diff --git a/.vscode/settings.json b/.vscode/settings.json index 8c7e9339f..4d6e4db99 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -17,5 +17,10 @@ ], "C_Cpp.default.cStandard": "c11", "C_Cpp.default.cppStandard": "c++17", - "C_Cpp.default.cpplint.filters": "CPPLINT.cfg" + "C_Cpp.default.cpplint.filters": "CPPLINT.cfg", + "[python]": { + "editor.defaultFormatter": "ms-python.autopep8" + }, + "python.formatting.provider": "none", + "activestate.promptRuntimeCreation": false } diff --git a/Algorithms/DataUtils.h b/Algorithms/DataUtils.h index 0ba2287b5..dfb146967 100644 --- a/Algorithms/DataUtils.h +++ b/Algorithms/DataUtils.h @@ -15,7 +15,6 @@ #include "rng.h" #include "../GdaConst.h" #include "../ShapeOperations/GalWeight.h" -using namespace std; //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /// @@ -236,7 +235,7 @@ class DataUtils { return d; } - static void doubleCenter(vector >& matrix) + static void doubleCenter(std::vector >& matrix) { int n = (int)matrix[0].size(); int k = (int)matrix.size(); @@ -256,7 +255,7 @@ class DataUtils { } } - static void multiply(vector >& matrix, double factor) + static void multiply(std::vector >& matrix, double factor) { int n = (int)matrix[0].size(); int k = (int)matrix.size(); @@ -267,7 +266,7 @@ class DataUtils { } } - static void squareEntries(vector >& matrix) + static void squareEntries(std::vector >& matrix) { int n = (int)matrix[0].size(); int k = (int)matrix.size(); @@ -278,7 +277,7 @@ class DataUtils { } } - static double prod(vector x, vector y) { + static double prod(std::vector x, std::vector y) { int n = (int)x.size(); double val = 0; for (int i=0; i& x) { + static double normalize(std::vector& x) { double norm = sqrt(prod(x, x)); for (int i = 0; i < x.size(); i++) x[i] /= norm; return norm; } - static void normalize(vector >& x) + static void normalize(std::vector >& x) { for (int i = 0; i < x.size(); i++) normalize(x[i]); } - static void eigen(vector >& matrix, vector >& evecs, vector& evals, int maxiter) { + static void eigen(std::vector >& matrix, std::vector >& evecs, std::vector& evals, int maxiter) { if ( GdaConst::use_gda_user_seed) { srand((int)GdaConst::gda_user_seed); @@ -321,7 +320,7 @@ class DataUtils { for (int iter = 0; (fabs(1.0 - r) > eps) && (iter < maxiter); iter++) { //for (int iter = 0; iter < maxiter; iter++) { - vector q(k,0); + std::vector q(k,0); for (int i = 0; i < k; i++) { for (int j = 0; j < k; j++) q[i] += matrix[i][j] * evecs[m][j]; @@ -334,7 +333,7 @@ class DataUtils { } } - static void reverse_eigen(vector >& matrix, vector >& evecs, vector& evals, int maxiter) { + static void reverse_eigen(std::vector >& matrix, std::vector >& evecs, std::vector& evals, int maxiter) { if ( GdaConst::use_gda_user_seed) { srand((int)GdaConst::gda_user_seed); @@ -355,7 +354,7 @@ class DataUtils { double r = 0.0; for (int iter = 0; (fabs(1.0 - r) > eps) && (iter < maxiter); iter++) { - vector q(k,0); + std::vector q(k,0); for (int i = 0; i < k; i++) { q[i] -= rho * evecs[m][i]; for (int j = 0; j < k; j++) @@ -369,14 +368,14 @@ class DataUtils { } } - static double smallestEigenvalue(vector >& matrix) + static double smallestEigenvalue(std::vector >& matrix) { int n = (int)matrix.size(); double rho = largestEigenvalue(matrix); double eps = 1.0E-6; //int maxiter = 100; double lambda = 0.0; - vector x(n); + std::vector x(n); for (int i = 0; i < n; i++) x[i] = (0.5 - (double) rand() / RAND_MAX); normalize(x); @@ -384,7 +383,7 @@ class DataUtils { double r = 0.0; for (int iter = 0; (abs(1.0 - r) > eps) && (iter < 100); iter++) { - vector q(n,0); + std::vector q(n,0); for (int i = 0; i < n; i++) { q[i] -= rho * x[i]; @@ -399,17 +398,17 @@ class DataUtils { return lambda + rho; } - static double largestEigenvalue(vector >& matrix) + static double largestEigenvalue(std::vector >& matrix) { int n = (int)matrix.size(); double eps = 1.0E-6; //int maxiter = 100; double lambda = 0.0; - vector x(n,1.0); + std::vector x(n,1.0); double r = 0.0; for (int iter = 0; (fabs(1.0 - r) > eps) && (iter < 100); iter++) { - vector q(n,0); + std::vector q(n,0); for (int i = 0; i < n; i++) { for (int j = 0; j < n; j++) @@ -423,7 +422,7 @@ class DataUtils { return lambda; } - static void randomize(vector >& matrix) { + static void randomize(std::vector >& matrix) { if ( GdaConst::use_gda_user_seed) { srand((int)GdaConst::gda_user_seed); } @@ -436,10 +435,10 @@ class DataUtils { } } - static vector landmarkIndices(vector >& matrix) { + static std::vector landmarkIndices(std::vector >& matrix) { int k = (int)matrix.size(); int n = (int)matrix[0].size(); - vector result(k); + std::vector result(k); for (int i = 0; i < k; i++) { for (int j = 0; j < n; j++) { if (matrix[i][j] == 0.0) { @@ -450,10 +449,10 @@ class DataUtils { return result; } - static vector > copyMatrix(vector >& matrix) { + static std::vector > copyMatrix(std::vector >& matrix) { int k = (int)matrix.size(); int n = (int)matrix[0].size(); - vector > copy(k); + std::vector > copy(k); for (int i = 0; i < k; i++) { copy[i].resize(n); @@ -541,8 +540,8 @@ class DataUtils { return result; } - static vector > copyRaggedMatrix(double** matrix, int n, int k) { - vector > copy(k); + static std::vector > copyRaggedMatrix(double** matrix, int n, int k) { + std::vector > copy(k); for (int i = 0; i < k; i++) { copy[i].resize(n); @@ -560,7 +559,7 @@ class DataUtils { return copy; } - static void selfprod(vector >& d, vector >& result) + static void selfprod(std::vector >& d, std::vector >& result) { int k = (int)d.size(); int n = (int)d[0].size(); @@ -574,18 +573,18 @@ class DataUtils { } } - static void svd(vector >& matrix, vector >& svecs, vector& svals, int maxiter=100) + static void svd(std::vector >& matrix, std::vector >& svecs, std::vector& svals, int maxiter=100) { int k = (int)matrix.size(); int n = (int)matrix[0].size(); int d = (int)svecs.size(); for (int m = 0; m < d; m++) svals[m] = normalize(svecs[m]); - vector > K(k); + std::vector > K(k); for (int i=0; i > temp(d); + std::vector > temp(d); for (int i=0; i > tempOld(d); + std::vector > tempOld(d); for (int i=0; i > landmarkMatrix(vector >& matrix) + static std::vector > landmarkMatrix(std::vector >& matrix) { int k = (int)matrix.size(); - vector > result(k); + std::vector > result(k); for (int i=0; i index = landmarkIndices(matrix); + std::vector index = landmarkIndices(matrix); for (int i = 0; i < k; i++) { for (int j = 0; j < k; j++) { result[i][j] = matrix[i][index[j]]; @@ -641,7 +640,7 @@ class DataUtils { } /* - static vector > pivotRows(vector >& matrix, int k) + static std::vector > pivotRows(std::vector >& matrix, int k) { int K = matrix.size(); if (k >= K) { @@ -649,11 +648,11 @@ class DataUtils { } int n = matrix[0].size(); //System.out.println(n + " " + k + " " + K); - vector > result(k); + std::vector > result(k); for (int i=0; i _min(n); + std::vector _min(n); for (int i = 0; i < n; i++) _min[i] = DBL_MAX; for (int i = 0; i < k; i++) { @@ -670,7 +669,7 @@ class DataUtils { return result; }*/ - static void scale(vector >& x, vector >& D) + static void scale(std::vector >& x, std::vector >& D) { int n = (int)x[0].size(); int d = (int)x.size(); @@ -691,13 +690,13 @@ class DataUtils { } /* - static vector > maxminPivotMatrix(vector >& matrix, int k) + static std::vector > maxminPivotMatrix(std::vector >& matrix, int k) { int n = matrix[0].size(); - vector > result(k); + std::vector > result(k); for (int i=0; i min(n); + std::vector min(n); for (int i = 0; i < n; i++) min[i] = DBL_MAX; for (int i = 0; i < k; i++) { for (int j = 0; j < n; j++) { @@ -712,10 +711,10 @@ class DataUtils { return result; } - static vector > randomPivotMatrix(vector >& matrix, int k) + static std::vector > randomPivotMatrix(std::vector >& matrix, int k) { int n = matrix[0].size(); - vector > result(k); + std::vector > result(k); for (int i=0; i HDBScan::ComputeCoreDistance(double** input_data, int n_pts, +std::vector HDBScan::ComputeCoreDistance(double** input_data, int n_pts, int n_dim, int min_samples, char dist) { - vector core_d; + std::vector core_d; core_d.resize(n_pts); double eps = 0; // error bound @@ -48,8 +48,8 @@ vector HDBScan::ComputeCoreDistance(double** input_data, int n_pts, HDBScan::HDBScan(int min_cluster_size, int min_samples, double alpha, int _cluster_selection_method, bool _allow_single_cluster, int rows, int cols, RawDistMatrix* raw_dist, - vector _core_dist, - const vector& _undefs) + std::vector _core_dist, + const std::vector& _undefs) { int cluster_selection_method = _cluster_selection_method; bool allow_single_cluster = _allow_single_cluster; @@ -152,7 +152,7 @@ HDBScan::~HDBScan() } } -vector > HDBScan::GetRegions() +std::vector > HDBScan::GetRegions() { int min_cid = labels[0]; int max_cid = labels[0]; @@ -164,7 +164,7 @@ vector > HDBScan::GetRegions() min_cid = labels[i]; } } - vector > regions(max_cid + 1); + std::vector > regions(max_cid + 1); for (int i=0; i=0) { @@ -182,12 +182,12 @@ void HDBScan::condense_tree(double** hierarchy, int N, int min_cluster_size) int num_points = root /2 + 1; int next_label = num_points + 1; - vector node_list = bfs_from_hierarchy(hierarchy, N-1, root); + std::vector node_list = bfs_from_hierarchy(hierarchy, N-1, root); - vector relabel(root+1); + std::vector relabel(root+1); relabel[root] = num_points; - vector ignore(node_list.size(),false); + std::vector ignore(node_list.size(),false); double lambda_value; int left_count, right_count; @@ -230,7 +230,7 @@ void HDBScan::condense_tree(double** hierarchy, int N, int min_cluster_size) condensed_tree.push_back(new CondensedTree(relabel[node], relabel[right], lambda_value, right_count)); } else if (left_count < min_cluster_size && right_count < min_cluster_size) { - vector sub_nodes = bfs_from_hierarchy(hierarchy, N-1, left); + std::vector sub_nodes = bfs_from_hierarchy(hierarchy, N-1, left); for (int j=0; j sub_nodes1 = bfs_from_hierarchy(hierarchy, N-1, right); + std::vector sub_nodes1 = bfs_from_hierarchy(hierarchy, N-1, right); for (int j=0; j sub_nodes = bfs_from_hierarchy(hierarchy, N-1, left); + std::vector sub_nodes = bfs_from_hierarchy(hierarchy, N-1, left); for (int j=0; j sub_nodes = bfs_from_hierarchy(hierarchy, N-1, right); + std::vector sub_nodes = bfs_from_hierarchy(hierarchy, N-1, right); for (int j=0; j HDBScan::outlier_scores(vector& tree) +std::vector HDBScan::outlier_scores(std::vector& tree) { // Generate GLOSH outlier scores from a condensed tree. - vector deaths = max_lambdas(tree); + std::vector deaths = max_lambdas(tree); int root_cluster = tree[0]->parent; - vector parent_array(tree.size()); + std::vector parent_array(tree.size()); parent_array[0] = tree[0]->parent; for (int i=1; i HDBScan::outlier_scores(vector& tree) } } - vector result(root_cluster, 0); + std::vector result(root_cluster, 0); - vector topological_sort_order(tree.size()); + std::vector topological_sort_order(tree.size()); for (int i=0; i HDBScan::outlier_scores(vector& tree) return result; } -boost::unordered_map HDBScan::compute_stability(vector& tree) +boost::unordered_map HDBScan::compute_stability(std::vector& tree) { int largest_child = tree[0]->child; int smallest_cluster = tree[0]->parent; @@ -351,14 +351,14 @@ boost::unordered_map HDBScan::compute_stability(vector > sorted_child_data(tree.size()); + std::vector > sorted_child_data(tree.size()); for (int i=0; ichild; sorted_child_data[i].second = tree[i]->lambda_val; } std::sort(sorted_child_data.begin(), sorted_child_data.end()); - vector births(largest_child + 1, -1); + std::vector births(largest_child + 1, -1); int current_child = -1; double min_lambda = 0; @@ -371,7 +371,7 @@ boost::unordered_map HDBScan::compute_stability(vector HDBScan::compute_stability(vector result_arr(num_clusters, 0); + std::vector result_arr(num_clusters, 0); for (int i=0; iparent; @@ -406,7 +406,7 @@ boost::unordered_map HDBScan::compute_stability(vector HDBScan::do_labelling(vector& tree, set& clusters, +std::vector HDBScan::do_labelling(std::vector& tree, std::set& clusters, boost::unordered_map& cluster_label_map, bool allow_single_cluster, bool match_reference_implementation) @@ -421,7 +421,7 @@ vector HDBScan::do_labelling(vector& tree, set& cluste parent_array_max = tree[i]->parent; } } - vector result(root_cluster); + std::vector result(root_cluster); TreeUnionFind union_find(parent_array_max + 1); @@ -486,13 +486,13 @@ vector HDBScan::do_labelling(vector& tree, set& cluste return result; } -vector HDBScan::get_probabilities(vector& tree, +std::vector HDBScan::get_probabilities(std::vector& tree, boost::unordered_map& cluster_map, - vector& labels) + std::vector& labels) { - vector result(labels.size(), 0); + std::vector result(labels.size(), 0); - vector deaths = max_lambdas(tree); + std::vector deaths = max_lambdas(tree); int root_cluster = tree[0]->parent; for (int i=0; iparent < root_cluster) { @@ -523,21 +523,21 @@ vector HDBScan::get_probabilities(vector& tree, if (max_lambda == 0.0 || tree[n]->lambda_val == DBL_MAX) { result[point] = 1.0; } else { - lambda_ = min(tree[n]->lambda_val, max_lambda); + lambda_ = std::min(tree[n]->lambda_val, max_lambda); result[point] = lambda_ / max_lambda; } } return result; } -vector HDBScan::get_stability_scores(vector& labels, set& clusters, +std::vector HDBScan::get_stability_scores(std::vector& labels, std::set& clusters, boost::unordered_map& stability, double max_lambda) { - vector result(clusters.size()); + std::vector result(clusters.size()); - vector clusters_; - set::iterator it; + std::vector clusters_; + std::set::iterator it; for (it=clusters.begin(); it!= clusters.end(); it++) { clusters_.push_back(*it); } @@ -560,7 +560,7 @@ vector HDBScan::get_stability_scores(vector& labels, set& clus return result; } -vector HDBScan::max_lambdas(vector& tree) +std::vector HDBScan::max_lambdas(std::vector& tree) { int largest_parent = tree[0]->parent; @@ -570,14 +570,14 @@ vector HDBScan::max_lambdas(vector& tree) } } - vector > sorted_parent_data(tree.size()); + std::vector > sorted_parent_data(tree.size()); for (int i=0; iparent; sorted_parent_data[i].second = tree[i]->lambda_val; } sort(sorted_parent_data.begin(), sorted_parent_data.end()); - vector deaths(largest_parent + 1, 0); + std::vector deaths(largest_parent + 1, 0); int current_parent = -1; double max_lambda = 0; @@ -587,7 +587,7 @@ vector HDBScan::max_lambdas(vector& tree) double lambda_ = sorted_parent_data[row].second; if (parent == current_parent){ - max_lambda = max(max_lambda, lambda_); + max_lambda = std::max(max_lambda, lambda_); } else if (current_parent != -1) { deaths[current_parent] = max_lambda; current_parent = parent; @@ -602,16 +602,16 @@ vector HDBScan::max_lambdas(vector& tree) return deaths; } -void HDBScan::get_clusters(vector& tree, +void HDBScan::get_clusters(std::vector& tree, boost::unordered_map& stability, - vector& out_labels, - vector& out_probs, - vector& out_stabilities, + std::vector& out_labels, + std::vector& out_probs, + std::vector& out_stabilities, int cluster_selection_method, bool allow_single_cluster, bool match_reference_implementation) { - vector node_list; + std::vector node_list; boost::unordered_map::iterator sit; for (sit = stability.begin(); sit!=stability.end(); sit++) { node_list.push_back(sit->first); @@ -622,7 +622,7 @@ void HDBScan::get_clusters(vector& tree, node_list.pop_back(); } - vector cluster_tree; + std::vector cluster_tree; for (int i=0; ichild_size > 1) { cluster_tree.push_back(tree[i]); @@ -670,7 +670,7 @@ void HDBScan::get_clusters(vector& tree, is_cluster[node] = false; stability[node] = subtree_stability; } else { - vector sub_nodes = bfs_from_cluster_tree(cluster_tree, node); + std::vector sub_nodes = bfs_from_cluster_tree(cluster_tree, node); for (int j=0; j& tree, } boost::unordered_map::iterator it; - vector leaves_ = get_cluster_tree_leaves(cluster_tree); - set leaves; + std::vector leaves_ = get_cluster_tree_leaves(cluster_tree); + std::set leaves; for (int i=0; i& tree, } } - set clusters; + std::set clusters; boost::unordered_map::iterator it; for (it = is_cluster.begin(); it!= is_cluster.end(); it++) { int c = it->first; @@ -718,8 +718,8 @@ void HDBScan::get_clusters(vector& tree, clusters.insert(c); } } - vector _clusters; - set::iterator _it; + std::vector _clusters; + std::set::iterator _it; for (_it =clusters.begin(); _it != clusters.end(); _it++) { _clusters.push_back(*_it); } @@ -745,9 +745,9 @@ void HDBScan::get_clusters(vector& tree, out_stabilities = get_stability_scores(out_labels, clusters, stability, max_lambda); } -vector HDBScan::get_cluster_tree_leaves(vector& cluster_tree) +std::vector HDBScan::get_cluster_tree_leaves(std::vector& cluster_tree) { - vector result; + std::vector result; if (cluster_tree.size()==0) { return result; @@ -764,10 +764,10 @@ vector HDBScan::get_cluster_tree_leaves(vector& cluster_tre } -vector HDBScan::recurse_leaf_dfs(vector& cluster_tree, int current_node) +std::vector HDBScan::recurse_leaf_dfs(std::vector& cluster_tree, int current_node) { - vector result; - vector children; + std::vector result; + std::vector children; for (int i=0; iparent == current_node) { children.push_back(cluster_tree[i]->child); @@ -781,7 +781,7 @@ vector HDBScan::recurse_leaf_dfs(vector& cluster_tree, int } else { for (int i=0; i tmp = recurse_leaf_dfs(cluster_tree, child); + std::vector tmp = recurse_leaf_dfs(cluster_tree, child); for (int j=0; j HDBScan::recurse_leaf_dfs(vector& cluster_tree, int } } -vector HDBScan::mst_linkage_core_vector(int num_features, - vector& core_distances, +std::vector HDBScan::mst_linkage_core_vector(int num_features, + std::vector& core_distances, RawDistMatrix* dist_metric, double alpha) { - vector rtn_mst_edges; + std::vector rtn_mst_edges; int dim = (int)core_distances.size(); double current_node_core_distance; - vector in_tree(dim,0); + std::vector in_tree(dim,0); int current_node = 0; - vector current_distances(dim, DBL_MAX); - vector current_sources(dim, 1); + std::vector current_distances(dim, DBL_MAX); + std::vector current_sources(dim, 1); for (int i=1; i is_component; - vector > _data; + std::vector is_component; + std::vector > _data; TreeUnionFind(int size) { _data.resize(size); is_component.resize(size); for (int i=0; i components() { - vector c; + std::vector components() { + std::vector c; for (int i=0; i mst_edges; - vector condensed_tree; - vector core_dist; - vector labels; - vector probabilities; - vector stabilities; - vector outliers; - set clusters; + std::vector mst_edges; + std::vector condensed_tree; + std::vector core_dist; + std::vector labels; + std::vector probabilities; + std::vector stabilities; + std::vector outliers; + std::set clusters; boost::unordered_map cluster_map, reverse_cluster_map; HDBScan(int min_points, @@ -200,78 +198,78 @@ namespace Gda { bool allow_single_cluster, int rows, int cols, RawDistMatrix* raw_dist, - vector core_dist, - const vector& undefs + std::vector core_dist, + const std::vector& undefs //GalElement * w, //double* controls, //double control_thres ); virtual ~HDBScan(); - static vector ComputeCoreDistance(double** input_data, int n_pts, + static std::vector ComputeCoreDistance(double** input_data, int n_pts, int n_dim, int min_samples, char dist); - static vector mst_linkage_core_vector(int num_features, - vector& core_distances, + static std::vector mst_linkage_core_vector(int num_features, + std::vector& core_distances, RawDistMatrix* dist_metric, double alpha); void Run(); - vector > GetRegions(); + std::vector > GetRegions(); - vector outlier_scores(vector& tree); + std::vector outlier_scores(std::vector& tree); boost::unordered_map compute_stability( - vector& condensed_tree); + std::vector& condensed_tree); void condense_tree(double** hierarchy, int N, int min_cluster_size=10); - vector max_lambdas(vector& tree); + std::vector max_lambdas(std::vector& tree); - vector do_labelling(vector& tree, - set& clusters, + std::vector do_labelling(std::vector& tree, + std::set& clusters, boost::unordered_map& cluster_label_map, bool allow_single_cluster = false, bool match_reference_implementation = false); - vector get_probabilities(vector& tree, + std::vector get_probabilities(std::vector& tree, boost::unordered_map& reverse_cluster_map, - vector& labels); + std::vector& labels); - vector get_stability_scores(vector& labels, - set& clusters, + std::vector get_stability_scores(std::vector& labels, + std::set& clusters, boost::unordered_map& stability, double max_lambda); - void get_clusters(vector& tree, + void get_clusters(std::vector& tree, boost::unordered_map& stability, - vector& out_labels, - vector& out_probs, - vector& out_stabilities, + std::vector& out_labels, + std::vector& out_probs, + std::vector& out_stabilities, int cluster_selection_method=0, bool allow_single_cluster= false, bool match_reference_implementation=false); - vector get_cluster_tree_leaves(vector& cluster_tree); + std::vector get_cluster_tree_leaves(std::vector& cluster_tree); - vector recurse_leaf_dfs(vector& cluster_tree, + std::vector recurse_leaf_dfs(std::vector& cluster_tree, int current_node); - vector bfs_from_hierarchy(double** hierarchy, int dim, int bfs_root) + std::vector bfs_from_hierarchy(double** hierarchy, int dim, int bfs_root) { int max_node = 2* dim; int num_points = max_node - dim + 1; - vector to_process; + std::vector to_process; to_process.push_back(bfs_root); - vector result; + std::vector result; while (!to_process.empty()) { for (int i=0; i tmp; + std::vector tmp; for (int i=0; i= num_points) { int x = to_process[i] - num_points; @@ -289,11 +287,11 @@ namespace Gda { return result; } - vector bfs_from_cluster_tree(vector& tree, int bfs_root) + std::vector bfs_from_cluster_tree(std::vector& tree, int bfs_root) { - vector result; - set to_process; - set::iterator it; + std::vector result; + std::set to_process; + std::set::iterator it; to_process.insert(bfs_root); @@ -301,7 +299,7 @@ namespace Gda { for (it = to_process.begin(); it != to_process.end(); it++) { result.push_back(*it); } - set tmp; + std::set tmp; for (int i=0; iparent) != to_process.end() ) { tmp.insert( tree[i]->child); diff --git a/Algorithms/maxp.cpp b/Algorithms/maxp.cpp index 221168dc9..9ce08597f 100644 --- a/Algorithms/maxp.cpp +++ b/Algorithms/maxp.cpp @@ -40,9 +40,8 @@ #include "maxp.h" using namespace boost; -using namespace std; -Maxp::Maxp(const GalElement* _w, const vector >& _z, double _floor, double* _floor_variable, int _initial, vector _seeds, int _method, int _tabu_length, double _cool_rate,int _rnd_seed, char _dist, bool _test ) +Maxp::Maxp(const GalElement* _w, const std::vector >& _z, double _floor, double* _floor_variable, int _initial, std::vector _seeds, int _method, int _tabu_length, double _cool_rate,int _rnd_seed, char _dist, bool _test ) : w(_w), z(_z), floor(_floor), floor_variable(_floor_variable), initial(_initial), LARGE(1000000), MAX_ATTEMPTS(100), rnd_seed(_rnd_seed), test(_test), initial_wss(_initial), regions_group(_initial), area2region_group(_initial), p_group(_initial), dist(_dist), best_ss(DBL_MAX), method(_method), tabu_length(_tabu_length), cooling_rate(_cool_rate) { num_obs = z.size(); @@ -67,19 +66,19 @@ Maxp::Maxp(const GalElement* _w, const vector >& _z, double _flo if (_seeds.empty()) { init_solution(-1); } else { - map > region_dict; + std::map > region_dict; for (int i=0; i< _seeds.size(); i++) { int rgn = _seeds[i]; this->area2region[i] = rgn; if (region_dict.find(rgn) == region_dict.end()) { - vector ids; + std::vector ids; ids.push_back(i); region_dict[rgn] = ids; } else { region_dict[rgn].push_back(i); } } - map >::iterator it; + std::map >::iterator it; for (it = region_dict.begin(); it!= region_dict.end(); it++) { this->regions.push_back(it->second); } @@ -94,7 +93,7 @@ Maxp::Maxp(const GalElement* _w, const vector >& _z, double _flo feasible = true; best_ss = objective_function(); - vector > best_regions; + std::vector > best_regions; boost::unordered_map best_area2region; int attemps = 0; @@ -104,7 +103,7 @@ Maxp::Maxp(const GalElement* _w, const vector >& _z, double _flo //run_threaded(); for (int i=0; i >& current_regions = regions_group[i]; + std::vector >& current_regions = regions_group[i]; boost::unordered_map& current_area2region = area2region_group[i]; //print_regions(current_regions); @@ -135,7 +134,7 @@ Maxp::~Maxp() } -wxString Maxp::print_regions(vector >& _regions) +wxString Maxp::print_regions(std::vector >& _regions) { wxString txt; txt << "regions:\n"; @@ -182,7 +181,7 @@ void Maxp::run_threaded() threadPool.join_all(); } -vector >& Maxp::GetRegions() +std::vector >& Maxp::GetRegions() { return regions; } @@ -194,17 +193,17 @@ void Maxp::init_solution(int solution_idx) bool solving = true; int attempts = 0; - vector > _regions; + std::vector > _regions; boost::unordered_map _area2region; while (solving && attempts <= MAX_ATTEMPTS) { - vector > regn; - list enclaves; - list candidates; + std::vector > regn; + std::list enclaves; + std::list candidates; boost::unordered_map candidates_dict; if (seeds.empty()) { - vector _candidates(num_obs); + std::vector _candidates(num_obs); for (int i=0; i::iterator iter; - vector::iterator vector_iter; + std::list::iterator iter; + std::vector::iterator vector_iter; while (!candidates.empty()) { int seed = candidates.front(); candidates.pop_front(); // try to grow it till threshold constraint is satisfied - vector region; + std::vector region; region.push_back(seed); boost::unordered_map region_dict; region_dict[seed] = true; @@ -271,7 +270,7 @@ void Maxp::init_solution(int solution_idx) } if (is_floor) { boost::unordered_map::iterator rit; - vector _region; + std::vector _region; for (rit=region_dict.begin(); rit!=region_dict.end();rit++) { if (rit->second) _region.push_back(rit->first); @@ -308,7 +307,7 @@ void Maxp::init_solution(int solution_idx) int enclave = enclaves.front(); enclaves.pop_front(); // find regions that close to this enclaved region - set _cand; + std::set _cand; for ( int n=0; n& arry, uint64_t& seed) +void Maxp::shuffle(std::vector& arry, uint64_t& seed) { //random_shuffle for (int i=arry.size()-1; i>=1; --i) { @@ -409,14 +408,14 @@ void Maxp::shuffle(vector& arry, uint64_t& seed) } -void Maxp::simulated_annealing(vector >& init_regions, boost::unordered_map& init_area2region, double alpha, double temperature, uint64_t seed_local) +void Maxp::simulated_annealing(std::vector >& init_regions, boost::unordered_map& init_area2region, double alpha, double temperature, uint64_t seed_local) { - vector > local_best_solution; + std::vector > local_best_solution; boost::unordered_map local_best_area2region; double local_best_ssd = 1; int nr = init_regions.size(); - vector changed_regions(nr, 1); + std::vector changed_regions(nr, 1); bool use_sa = false; double T = 1; // temperature @@ -430,11 +429,11 @@ void Maxp::simulated_annealing(vector >& init_regions, boost::unorde bool swapping = true; int total_move = 0; int nr = init_regions.size(); - vector::iterator iter; - vector changed_regions(nr, 1); + std::vector::iterator iter; + std::vector changed_regions(nr, 1); while (swapping) { int moves_made = 0; - vector regionIds; + std::vector regionIds; for (int r=0; r0) { regionIds.push_back(r); @@ -461,10 +460,10 @@ void Maxp::simulated_annealing(vector >& init_regions, boost::unorde int m_size = member_dict.size(); int n_size = neighbors_dict.size(); - vector candidates; + std::vector candidates; for (n_it=neighbors_dict.begin(); n_it!=neighbors_dict.end(); n_it++) { int nbr = n_it->first; - vector& block = init_regions[ init_area2region[ nbr ] ]; + std::vector& block = init_regions[ init_area2region[ nbr ] ]; if (check_floor(block, nbr)) { if (check_contiguity(w, block, nbr)) { candidates.push_back(nbr); @@ -479,8 +478,8 @@ void Maxp::simulated_annealing(vector >& init_regions, boost::unorde bool best_found = false; for (int j=0; j& current_internal = init_regions[seed]; - vector& current_outter = init_regions[init_area2region[area]]; + std::vector& current_internal = init_regions[seed]; + std::vector& current_outter = init_regions[init_area2region[area]]; double change = objective_function_change(area, current_internal, current_outter); change = -change / (local_best_ssd * T); if (exp(change) > Gda::ThomasWangHashDouble(seed_local++)) { @@ -493,7 +492,7 @@ void Maxp::simulated_annealing(vector >& init_regions, boost::unorde // make the move int area = best; int old_region = init_area2region[area]; - vector& rgn = init_regions[old_region]; + std::vector& rgn = init_regions[old_region]; rgn.erase(remove(rgn.begin(),rgn.end(), area), rgn.end()); init_area2region[area] = seed; @@ -510,8 +509,8 @@ void Maxp::simulated_annealing(vector >& init_regions, boost::unorde bool best_found = false; for (int j=0; j& current_internal = init_regions[seed]; - vector& current_outter = init_regions[init_area2region[area]]; + std::vector& current_internal = init_regions[seed]; + std::vector& current_outter = init_regions[init_area2region[area]]; double change = objective_function_change(area, current_internal, current_outter); if (change <= cv) { best = area; @@ -524,7 +523,7 @@ void Maxp::simulated_annealing(vector >& init_regions, boost::unorde // make the move int area = best; int old_region = init_area2region[area]; - vector& rgn = init_regions[old_region]; + std::vector& rgn = init_regions[old_region]; rgn.erase(remove(rgn.begin(),rgn.end(), area), rgn.end()); init_area2region[area] = seed; @@ -540,7 +539,7 @@ void Maxp::simulated_annealing(vector >& init_regions, boost::unorde for (int k=0; k& block = init_regions[ init_area2region[ nbr ] ]; + std::vector& block = init_regions[ init_area2region[ nbr ] ]; if (check_floor(block, nbr)) { if (check_contiguity(w, block, nbr)) { candidates.push_back(nbr); @@ -594,26 +593,26 @@ void Maxp::simulated_annealing(vector >& init_regions, boost::unorde } } -void Maxp::tabu_search(vector >& init_regions, boost::unordered_map& init_area2region, int tabuLength, uint64_t seed_local) +void Maxp::tabu_search(std::vector >& init_regions, boost::unordered_map& init_area2region, int tabuLength, uint64_t seed_local) { - vector > local_best_solution; + std::vector > local_best_solution; boost::unordered_map local_best_area2region; double local_best_ssd = 0; int nr = init_regions.size(); - vector changed_regions(nr, 1); + std::vector changed_regions(nr, 1); // tabuLength: Number of times a reverse move is prohibited. Default value tabuLength = 85. int convTabu = 230 * sqrt((double)nr); // convTabu=230*numpy.sqrt(maxP) - vector tabuList; + std::vector tabuList; bool use_tabu = false; int c = 0; while ( c regionIds; + std::vector regionIds; for (int r=0; r0 || use_tabu) { regionIds.push_back(r); @@ -640,10 +639,10 @@ void Maxp::tabu_search(vector >& init_regions, boost::unordered_map< neighbors_dict[cand] = true; } } - vector candidates; + std::vector candidates; for (n_it=neighbors_dict.begin(); n_it!=neighbors_dict.end(); n_it++) { int nbr = n_it->first; - vector& block = init_regions[ init_area2region[ nbr ] ]; + std::vector& block = init_regions[ init_area2region[ nbr ] ]; if (check_floor(block, nbr)) { if (check_contiguity(w, block, nbr)) { candidates.push_back(nbr); @@ -657,8 +656,8 @@ void Maxp::tabu_search(vector >& init_regions, boost::unordered_map< bool best_found = false; for (int j=0; j& current_internal = init_regions[seed]; - vector& current_outter = init_regions[init_area2region[area]]; + std::vector& current_internal = init_regions[seed]; + std::vector& current_outter = init_regions[init_area2region[area]]; if (!tabuList.empty()) { TabuMove tabu(area, init_area2region[area], seed); if ( find(tabuList.begin(), tabuList.end(), tabu) != tabuList.end() ) @@ -689,8 +688,8 @@ void Maxp::tabu_search(vector >& init_regions, boost::unordered_map< bool best_found = false; for (int j=0; j& current_internal = init_regions[seed]; - vector& current_outter = init_regions[init_area2region[area]]; + std::vector& current_internal = init_regions[seed]; + std::vector& current_outter = init_regions[init_area2region[area]]; // prohibit tabu TabuMove tabu(area, init_area2region[area], seed); if ( find(tabuList.begin(), tabuList.end(), tabu) != tabuList.end() ) @@ -753,18 +752,18 @@ void Maxp::tabu_search(vector >& init_regions, boost::unordered_map< } -void Maxp::move(int area, int from_region, int to_region, vector >& _regions, boost::unordered_map& _area2region) +void Maxp::move(int area, int from_region, int to_region, std::vector >& _regions, boost::unordered_map& _area2region) { - vector& rgn = _regions[from_region]; + std::vector& rgn = _regions[from_region]; rgn.erase(remove(rgn.begin(),rgn.end(), area), rgn.end()); _area2region[area] = to_region; _regions[to_region].push_back(area); } -void Maxp::move(int area, int from_region, int to_region, vector >& _regions, boost::unordered_map& _area2region, vector& tabu_list, int max_labu_length) +void Maxp::move(int area, int from_region, int to_region, std::vector >& _regions, boost::unordered_map& _area2region, std::vector& tabu_list, int max_labu_length) { - vector& rgn = _regions[from_region]; + std::vector& rgn = _regions[from_region]; rgn.erase(remove(rgn.begin(),rgn.end(), area), rgn.end()); _area2region[area] = to_region; @@ -780,7 +779,7 @@ void Maxp::move(int area, int from_region, int to_region, vector >& } } -void Maxp::swap(vector >& init_regions, boost::unordered_map& init_area2region, uint64_t seed_local) +void Maxp::swap(std::vector >& init_regions, boost::unordered_map& init_area2region, uint64_t seed_local) { // local search AZP @@ -789,8 +788,8 @@ void Maxp::swap(vector >& init_regions, boost::unordered_map::iterator iter; - vector changed_regions(nr, 1); + std::vector::iterator iter; + std::vector changed_regions(nr, 1); // nr = range(k) //while (swapping ) { @@ -800,7 +799,7 @@ void Maxp::swap(vector >& init_regions, boost::unordered_map regionIds; + std::vector regionIds; for (int r=0; r0) { regionIds.push_back(r); @@ -838,10 +837,10 @@ void Maxp::swap(vector >& init_regions, boost::unordered_map candidates; + std::vector candidates; for (n_it=neighbors_dict.begin(); n_it!=neighbors_dict.end(); n_it++) { int nbr = n_it->first; - vector& block = init_regions[ init_area2region[ nbr ] ]; + std::vector& block = init_regions[ init_area2region[ nbr ] ]; if (check_floor(block, nbr)) { if (check_contiguity(w, block, nbr)) { candidates.push_back(nbr); @@ -855,8 +854,8 @@ void Maxp::swap(vector >& init_regions, boost::unordered_map& current_internal = init_regions[seed]; - vector& current_outter = init_regions[init_area2region[area]]; + std::vector& current_internal = init_regions[seed]; + std::vector& current_outter = init_regions[init_area2region[area]]; double change = objective_function_change(area, current_internal, current_outter); if (change <= cv) { //if (check_contiguity(w, current_internal, area)) { @@ -871,7 +870,7 @@ void Maxp::swap(vector >& init_regions, boost::unordered_map& rgn = init_regions[old_region]; + std::vector& rgn = init_regions[old_region]; rgn.erase(remove(rgn.begin(),rgn.end(), area), rgn.end()); init_area2region[area] = seed; @@ -888,7 +887,7 @@ void Maxp::swap(vector >& init_regions, boost::unordered_map& block = init_regions[ init_area2region[ nbr ] ]; + std::vector& block = init_regions[ init_area2region[ nbr ] ]; if (check_floor(block, nbr)) { if (check_contiguity(w, block, nbr)) { candidates.push_back(nbr); @@ -908,7 +907,7 @@ void Maxp::swap(vector >& init_regions, boost::unordered_map& region, int leaver) +bool Maxp::check_floor(const std::vector& region, int leaver) { // selectionIDs = [self.w.id_order.index(i) for i in region] double cv = 0; @@ -923,7 +922,7 @@ bool Maxp::check_floor(const vector& region, int leaver) return false; } -bool Maxp::check_floor(const vector& region) +bool Maxp::check_floor(const std::vector& region) { // selectionIDs = [self.w.id_order.index(i) for i in region] double cv = 0; @@ -943,7 +942,7 @@ double Maxp::objective_function() return objective_function(regions); } -double Maxp::objective_function(vector& solution) +double Maxp::objective_function(std::vector& solution) { //if (objval_dict.find(solution) != objval_dict.end()) { // return objval_dict[solution]; @@ -957,7 +956,7 @@ double Maxp::objective_function(vector& solution) // for every variable, calc the variance using selected neighbors for (int m=0; m selected_z(n_size); + std::vector selected_z(n_size); for (int i=0; i& solution) return wss; } -double Maxp::objective_function(vector& region1, int leaver, vector& region2, int comer ) +double Maxp::objective_function(std::vector& region1, int leaver, std::vector& region2, int comer ) { // solution is a list of region ids [1,7,2] double wss = 0; @@ -980,7 +979,7 @@ double Maxp::objective_function(vector& region1, int leaver, vector& r int n_size = region1.size(); // for every variable, calc the variance using selected neighbors for (int m=0; m selected_z(n_size-1); + std::vector selected_z(n_size-1); j = 0; for (int i=0; i& region1, int leaver, vector& r n_size = region2.size(); // for every variable, calc the variance using selected neighbors for (int m=0; m selected_z(n_size+1); + std::vector selected_z(n_size+1); for (int i=0; i& region1, int leaver, vector& r return wss; } -double Maxp::objective_function(vector >& solution) +double Maxp::objective_function(std::vector >& solution) { // solution is a list of lists of region ids [[1,7,2],[0,4,3],...] such // that the first region has areas 1,7,2 the second region 0,4,3 and so @@ -1018,7 +1017,7 @@ double Maxp::objective_function(vector >& solution) for (int i=0; i > selected_z(num_vars); + std::vector > selected_z(num_vars); for (int j=0; j >& solution) return wss; } -double Maxp::objective_function(vector& current_internal, vector& current_outter) +double Maxp::objective_function(std::vector& current_internal, std::vector& current_outter) { - vector > composed_region; + std::vector > composed_region; composed_region.push_back(current_internal); composed_region.push_back(current_outter); @@ -1046,7 +1045,7 @@ double Maxp::objective_function(vector& current_internal, vector& curr } -double Maxp::objective_function_change(int area, vector& current_internal, vector& current_outter) +double Maxp::objective_function_change(int area, std::vector& current_internal, std::vector& current_outter) { double current = objective_function(current_internal) + objective_function(current_outter); double new_val = objective_function(current_outter, area, current_internal, area); @@ -1054,12 +1053,12 @@ double Maxp::objective_function_change(int area, vector& current_internal, return change; } -bool Maxp::check_contiguity(const GalElement* w, vector& ids, int leaver) +bool Maxp::check_contiguity(const GalElement* w, std::vector& ids, int leaver) { //vector ids = neighbors; //ids.erase(remove(ids.begin(),ids.end(), leaver), ids.end()); //return is_component(w, ids); - list q; + std::list q; boost::unordered_map marks; for (int i=0; i vdata; + std::vector vdata; boost::unordered_map mdict; std::vector::iterator v_iter; boost::unordered_map::iterator m_iter; @@ -79,7 +78,7 @@ class Maxp \param initial int number of initial solutions to generate \param seed list ids of observations to form initial seeds. If len(ids) is less than the number of observations, the complementary ids are added to the end of seeds. Thus the specified seeds get priority in the solution */ - Maxp(const GalElement* w, const vector >& z, double floor, double* floor_variable, int initial, vector seeds,int _method, int _tabu_lenght, double _cool_rate, int rnd_seed=-1, char dist='e', bool test=false); + Maxp(const GalElement* w, const std::vector >& z, double floor, double* floor_variable, int initial, std::vector seeds,int _method, int _tabu_lenght, double _cool_rate, int rnd_seed=-1, char dist='e', bool test=false); //! A Deconstructor @@ -95,7 +94,7 @@ class Maxp \param neighbor \return boolean */ - vector >& GetRegions(); + std::vector >& GetRegions(); protected: //! A const spatial weights reference. @@ -128,11 +127,11 @@ class Maxp */ int num_vars; - //! A vector of vector list of ids to form initial seeds. + //! A vector of std::vector list of ids to form initial seeds. /*! Details. seed list ids of observations to form initial seeds. */ - vector seeds; + std::vector seeds; //! A n*1 vector of observations on variable for the floor /*! @@ -144,7 +143,7 @@ class Maxp /*! Details. This is used to calculate intra-regional */ - const vector > z; + const std::vector > z; //! A map variable mapping of areas to region. /*! @@ -156,13 +155,13 @@ class Maxp boost::unordered_map, double> objval_dict; - //! A vector of vector list of lists of regions. + //! A vector of std::vector list of lists of regions. /*! Details. each list has the ids of areas in that region. */ - vector > regions; + std::vector > regions; - vector > > regions_group; + std::vector > > regions_group; double best_ss; @@ -172,7 +171,7 @@ class Maxp */ int p; - vector p_group; + std::vector p_group; //! A integer number of initializations. /*! @@ -214,7 +213,7 @@ class Maxp uint64_t seed_increment; - vector initial_wss; + std::vector initial_wss; //! A protected member function: init_solution(void). /*! @@ -230,7 +229,7 @@ class Maxp /*! Details. */ - void swap(vector >& init_regions, boost::unordered_map& area2region, uint64_t seed_local); + void swap(std::vector >& init_regions, boost::unordered_map& area2region, uint64_t seed_local); //! xxx /* ! @@ -238,7 +237,7 @@ class Maxp \param neighbor \return boolean */ - void tabu_search(vector >& init_regions, boost::unordered_map& init_area2region, int tabuLength, uint64_t seed_local); + void tabu_search(std::vector >& init_regions, boost::unordered_map& init_area2region, int tabuLength, uint64_t seed_local); //! xxx /* ! @@ -246,7 +245,7 @@ class Maxp \param neighbor \return boolean */ - void simulated_annealing(vector >& init_regions, boost::unordered_map& init_area2region, double alpha, double temperature, uint64_t seed_local); + void simulated_annealing(std::vector >& init_regions, boost::unordered_map& init_area2region, double alpha, double temperature, uint64_t seed_local); //! xxx /* ! @@ -254,46 +253,46 @@ class Maxp \param neighbor \return boolean */ - void move(int area, int from_region, int to_region, vector >& regions, boost::unordered_map& area2region); + void move(int area, int from_region, int to_region, std::vector >& regions, boost::unordered_map& area2region); - void move(int area, int from_region, int to_region, vector >& regions, boost::unordered_map& area2region, vector& tabu_list, int max_tabu_length); + void move(int area, int from_region, int to_region, std::vector >& regions, boost::unordered_map& area2region, std::vector& tabu_list, int max_tabu_length); //! A protected member function: init_solution(void). return /*! \param region a const vector of unsigned int. \return boolean true if meet floor else return false */ - bool check_floor(const vector& region); + bool check_floor(const std::vector& region); - bool check_floor(const vector& region, int leaver); + bool check_floor(const std::vector& region, int leaver); double objective_function(); - double objective_function(vector& solution); + double objective_function(std::vector& solution); - double objective_function(vector& region1, int leaver, vector& region2, int comer); + double objective_function(std::vector& region1, int leaver, std::vector& region2, int comer); - double objective_function(vector >& solution); + double objective_function(std::vector >& solution); - double objective_function(vector& current_internal, vector& current_outter); + double objective_function(std::vector& current_internal, std::vector& current_outter); - double objective_function_change(int area, vector& current_internal, vector& current_outter); + double objective_function_change(int area, std::vector& current_internal, std::vector& current_outter); - wxString print_regions(vector >& _regions); + wxString print_regions(std::vector >& _regions); //! xxx /* ! \param block \param neighbor \return boolean */ - bool check_contiguity(const GalElement* w, vector& block, int neighbor); + bool check_contiguity(const GalElement* w, std::vector& block, int neighbor); - void shuffle(vector& arry, uint64_t& seed); + void shuffle(std::vector& arry, uint64_t& seed); bool test; - list test_random_numbers; - list enclave_random_number; - list > test_random_cand; + std::list test_random_numbers; + std::list enclave_random_number; + std::list > test_random_cand; }; #endif diff --git a/Algorithms/mds.cpp b/Algorithms/mds.cpp index 0617735c7..7de6d712a 100644 --- a/Algorithms/mds.cpp +++ b/Algorithms/mds.cpp @@ -17,12 +17,12 @@ AbstractMDS::~AbstractMDS() { } -vector >& AbstractMDS::GetResult() +std::vector >& AbstractMDS::GetResult() { return result; } -void AbstractMDS::fullmds(vector >& d, int dim, int maxiter) +void AbstractMDS::fullmds(std::vector >& d, int dim, int maxiter) { int k = d.size(); int n = d[0].size(); @@ -32,7 +32,7 @@ void AbstractMDS::fullmds(vector >& d, int dim, int maxiter) DataUtils::multiply(d, -0.5); DataUtils::randomize(result); - vector evals(dim); + std::vector evals(dim); DataUtils::eigen(d, result, evals, maxiter); for (int i = 0; i < dim; i++) { @@ -43,7 +43,7 @@ void AbstractMDS::fullmds(vector >& d, int dim, int maxiter) } } -vector AbstractMDS::pivotmds(vector >& input, vector >& result) +std::vector AbstractMDS::pivotmds(std::vector >& input, std::vector >& result) { int k = input.size(); int n = input[0].size(); @@ -52,7 +52,7 @@ vector AbstractMDS::pivotmds(vector >& input, vector evals(k); + std::vector evals(k); DataUtils::doubleCenter(input); DataUtils::multiply(input, -0.5); DataUtils::svd(input, result, evals); @@ -64,7 +64,7 @@ vector AbstractMDS::pivotmds(vector >& input, vector >& distances, int dim, int maxiter) +FastMDS::FastMDS(std::vector >& distances, int dim, int maxiter) : AbstractMDS(distances.size(), dim) { int k = distances.size(); @@ -78,12 +78,12 @@ FastMDS::~FastMDS() { } -vector > FastMDS::classicalScaling(vector >& d, int dim, int maxiter) +std::vector > FastMDS::classicalScaling(std::vector >& d, int dim, int maxiter) { - vector > dist = d; // deep copy + std::vector > dist = d; // deep copy int n = d[0].size(); /* - vector > dist(d.size()); + std::vector > dist(d.size()); for(int i=0; i > FastMDS::classicalScaling(vector >& d, in } }*/ - vector > result(dim); + std::vector > result(dim); for (int i=0; i lambds = lmds(dist, result, maxiter); + std::vector lambds = lmds(dist, result, maxiter); return result; } -vector FastMDS::lmds(vector >& P, vector >& result, int maxiter) +std::vector FastMDS::lmds(std::vector >& P, std::vector >& result, int maxiter) { - vector > distances = P; // deep copy + std::vector > distances = P; // deep copy /* - vector > distances(P.size()); + std::vector > distances(P.size()); for (int i=0; i FastMDS::lmds(vector >& P, vector > int n = distances[0].size(); int d = result.size(); - vector mean(n); + std::vector mean(n); for (int i = 0; i < n; i++) for (int j = 0; j < k; j++) mean[i] += distances[j][i]; for (int i = 0; i < n; i++) mean[i] /= k; - vector lambda(d); - vector > temp(d); + std::vector lambda(d); + std::vector > temp(d); for (int i=0; i > K = DataUtils::landmarkMatrix(P); + std::vector > K = DataUtils::landmarkMatrix(P); //DataUtils::squareEntries(K); DataUtils::doubleCenter(K); DataUtils::multiply(K, -0.5); - vector > E = K; + std::vector > E = K; DataUtils::eigen(K, temp, lambda, maxiter); for (int i = 0; i < temp.size(); i++) { @@ -152,48 +152,48 @@ vector FastMDS::lmds(vector >& P, vector > } /* -vector > classicalScaling(vector > d, int dim) +std::vector > classicalScaling(std::vector > d, int dim) { int n = d[0].size(); - vector > dist = new double[d.size()][d[0].size()]; + std::vector > dist = new double[d.size()][d[0].size()]; for (int i = 0; i < d.size(); i++) { for (int j = 0; j < d[0].size(); j++) { dist[i][j] = d[i][j]; } } - vector > result = new double[dim][n]; + std::vector > result = new double[dim][n]; DataUtils::randomize(result); ClassicalScaling.lmds(dist, result); return result; } -vector > classicalScaling(vector > d) +std::vector > classicalScaling(std::vector > d) { return classicalScaling(d, 2); } -vector > stressMinimization(vector > d, vector > w) +std::vector > stressMinimization(std::vector > d, std::vector > w) { return stressMinimization(d, w, 2); } -vector > stressMinimization(vector > d, int dim) +std::vector > stressMinimization(std::vector > d, int dim) { - vector > x = classicalScaling(d, dim); + std::vector > x = classicalScaling(d, dim); StressMinimization sm = new StressMinimization(d, x); sm.iterate(0, 0, 5); return x; } -vector > stressMinimization(vector > d, vector > w, int dim) +std::vector > stressMinimization(std::vector > d, std::vector > w, int dim) { - vector > x = classicalScaling(d, dim); + std::vector > x = classicalScaling(d, dim); StressMinimization sm = new StressMinimization(d, x, w); sm.iterate(0, 0, 3); return x; } -vector > stressMinimization(vector > d) +std::vector > stressMinimization(std::vector > d) { return stressMinimization(d, 2); } diff --git a/Algorithms/mds.h b/Algorithms/mds.h index 126e6d359..46d07b62b 100644 --- a/Algorithms/mds.h +++ b/Algorithms/mds.h @@ -12,25 +12,25 @@ class AbstractMDS { AbstractMDS(int n, int dim); ~AbstractMDS(); - virtual void fullmds(vector >& d, int dim, int maxiter=100); - virtual vector pivotmds(vector >& input, vector >& result); - virtual vector >& GetResult(); + virtual void fullmds(std::vector >& d, int dim, int maxiter=100); + virtual std::vector pivotmds(std::vector >& input, std::vector >& result); + virtual std::vector >& GetResult(); protected: int n; int dim; - vector > result; + std::vector > result; }; class FastMDS : public AbstractMDS { public: - FastMDS(vector >& distances, int dim, int maxiter); + FastMDS(std::vector >& distances, int dim, int maxiter); virtual ~FastMDS(); protected: - vector > classicalScaling(vector >& d, int dim, int maxiter); - vector lmds(vector >& P, vector >& result, int maxiter); + std::vector > classicalScaling(std::vector >& d, int dim, int maxiter); + std::vector lmds(std::vector >& P, std::vector >& result, int maxiter); }; /* diff --git a/Algorithms/pca.cpp b/Algorithms/pca.cpp index ed828d61a..200c102b6 100755 --- a/Algorithms/pca.cpp +++ b/Algorithms/pca.cpp @@ -6,7 +6,6 @@ #include #include "pca.h" -using namespace std; using namespace Eigen; Pca::Pca(double** x, const unsigned int &nrows, const unsigned int &ncols) @@ -46,7 +45,7 @@ std::vector Pca::prop_of_var(void) {return _prop_of_var; }; std::vector Pca::cum_prop(void) { return _cum_prop; }; std::vector Pca::scores(void) { return _scores; }; std::vector Pca::eliminated_columns(void) { return _eliminated_columns; } -string Pca::method(void) { return _method; } +std::string Pca::method(void) { return _method; } unsigned int Pca::kaiser(void) { return _kaiser; }; unsigned int Pca::thresh95(void) { return _thresh95; }; unsigned int Pca::ncols(void) { return _ncols; } @@ -85,9 +84,9 @@ int Pca::CalculateSVD() _prop_of_var.push_back(tmp_vec(i)); } #ifdef DEBUG - cout << "\n\nStandard deviations for PCs:\n"; + std::cout << "\n\nStandard deviations for PCs:\n"; copy(_sd.begin(), _sd.end(),std::ostream_iterator(std::cout," ")); - cout << "\n\nKaiser criterion: PC #" << _kaiser << endl; + std::cout << "\n\nKaiser criterion: PC #" << _kaiser << std::endl; #endif tmp_vec.resize(0); @@ -101,16 +100,16 @@ int Pca::CalculateSVD() } } #ifdef DEBUG - cout << "\nCumulative proportion:\n"; + std::cout << "\nCumulative proportion:\n"; copy(_cum_prop.begin(), _cum_prop.end(),std::ostream_iterator(std::cout," ")); - cout << "\n\nThresh95 criterion: PC #" << _thresh95 << endl; + std::cout << "\n\nThresh95 criterion: PC #" << _thresh95 << std::endl; #endif // Scores MatrixXf eigen_scores = _xXf * eigen_vectors; #ifdef DEBUG - cout << "\n\nEigen vectors:\n" << eigen_vectors; - cout << "\n\nRotated values (scores):\n" << eigen_scores; + std::cout << "\n\nEigen vectors:\n" << eigen_vectors; + std::cout << "\n\nRotated values (scores):\n" << eigen_scores; #endif _scores.reserve(eigen_scores.rows()*eigen_scores.cols()); for (unsigned int i = 0; i < eigen_scores.rows(); ++i) { @@ -120,9 +119,9 @@ int Pca::CalculateSVD() } eigen_scores.resize(0, 0); #ifdef DEBUG - cout << "\n\nScores in vector:\n"; + std::cout << "\n\nScores in vector:\n"; copy(_scores.begin(), _scores.end(),std::ostream_iterator(std::cout," ")); - cout << "\n"; + std::cout << "\n"; #endif return 0; } @@ -145,10 +144,10 @@ int Pca::Calculate() sds = eigen_cov.diagonal().array().sqrt(); MatrixXf outer_sds = sds * sds.transpose(); #ifdef DEBUG - cout << _xXf << endl; - cout << eigen_cov << endl; - cout << sds << endl; - cout << outer_sds << endl; + std::cout << _xXf << std::endl; + std::cout << eigen_cov << std::endl; + std::cout << sds << std::endl; + std::cout << outer_sds << std::endl; #endif eigen_cov = eigen_cov.array() / outer_sds.array(); outer_sds.resize(0, 0); @@ -157,16 +156,16 @@ int Pca::Calculate() VectorXf eigen_eigenvalues = edc.eigenvalues().real(); MatrixXf eigen_eigenvectors = edc.eigenvectors().real(); #ifdef DEBUG - cout << eigen_cov << endl; - cout << endl << eigen_eigenvalues.transpose() << endl; - cout << endl << eigen_eigenvectors << endl; + std::cout << eigen_cov << std::endl; + std::cout << std::endl << eigen_eigenvalues.transpose() << std::endl; + std::cout << std::endl << eigen_eigenvectors << std::endl; #endif // The eigenvalues and eigenvectors are not sorted in any particular order. // So, we should sort them - typedef pair eigen_pair; - vector ep; + typedef std::pair eigen_pair; + std::vector ep; for (unsigned int i = 0 ; i < _ncols; ++i) { - ep.push_back(make_pair(eigen_eigenvalues(i), i)); + ep.push_back(std::make_pair(eigen_eigenvalues(i), i)); } sort(ep.begin(), ep.end()); // Ascending order by default // Sort them all in descending order @@ -179,8 +178,8 @@ int Pca::Calculate() eigen_eigenvectors_sorted.col(colnum++) += eigen_eigenvectors.col(ep[i].second); } #ifdef DEBUG - cout << endl << eigen_eigenvalues_sorted.transpose() << endl; - cout << endl << eigen_eigenvectors_sorted << endl; + std::cout << std::endl << eigen_eigenvalues_sorted.transpose() << std::endl; + std::cout << std::endl << eigen_eigenvectors_sorted << std::endl; #endif // We don't need not sorted arrays anymore eigen_eigenvalues.resize(0); @@ -196,11 +195,11 @@ int Pca::Calculate() _prop_of_var.push_back(eigen_eigenvalues_sorted(i)/tmp_sum); } #ifdef DEBUG - cout << "\nStandard deviations for PCs:\n"; + std::cout << "\nStandard deviations for PCs:\n"; copy(_sd.begin(), _sd.end(), std::ostream_iterator(std::cout," ")); - cout << "\nProportion of variance:\n"; + std::cout << "\nProportion of variance:\n"; copy(_prop_of_var.begin(), _prop_of_var.end(), std::ostream_iterator(std::cout," ")); - cout << "\nKaiser criterion: PC #" << _kaiser << endl; + std::cout << "\nKaiser criterion: PC #" << _kaiser << std::endl; #endif // PC's cumulative proportion _cum_prop.clear(); _thresh95 = 1; @@ -212,9 +211,9 @@ int Pca::Calculate() } } #ifdef DEBUG - cout << "\n\nCumulative proportions:\n"; + std::cout << "\n\nCumulative proportions:\n"; copy(_cum_prop.begin(), _cum_prop.end(), std::ostream_iterator(std::cout," ")); - cout << "\n\n95% threshold: PC #" << _thresh95 << endl; + std::cout << "\n\n95% threshold: PC #" << _thresh95 << std::endl; #endif eigen_values = eigen_eigenvalues_sorted; eigen_vectors = eigen_eigenvectors_sorted; @@ -226,7 +225,7 @@ int Pca::Calculate() sds.resize(0); MatrixXf eigen_scores = _xXf * eigen_eigenvectors_sorted; #ifdef DEBUG - cout << "\n\nRotated values (scores):\n" << eigen_scores; + std::cout << "\n\nRotated values (scores):\n" << eigen_scores; #endif _scores.clear(); _scores.reserve(_ncols*_nrows); @@ -237,9 +236,9 @@ int Pca::Calculate() } eigen_scores.resize(0, 0); #ifdef DEBUG - cout << "\n\nScores in vector:\n"; + std::cout << "\n\nScores in vector:\n"; copy(_scores.begin(), _scores.end(), std::ostream_iterator(std::cout," ")); - cout << "\n"; + std::cout << "\n"; #endif return 0; } diff --git a/Algorithms/redcap.cpp b/Algorithms/redcap.cpp index f81ef738a..5096ab246 100644 --- a/Algorithms/redcap.cpp +++ b/Algorithms/redcap.cpp @@ -373,7 +373,7 @@ void Tree::Partition(int start, int end, std::vector& ids, if (checkControl(cand_ids, ids, -1)) { Measure result; ssd_utils->MeasureSplit(ssd, visited_ids, tmp_split_pos, result); - //cout << result.measure_reduction << endl; + //cout << result.measure_reduction << std::endl; if (result.measure_reduction > tmp_ssd_reduce) { tmp_ssd_reduce = result.measure_reduction; tmp_ssd = result.ssd; @@ -398,7 +398,7 @@ void Tree::Partition(int start, int end, std::vector& ids, void Tree::Split(int orig, int dest, boost::unordered_map >& nbr_dict, std::vector& cand_ids) { - stack visited_ids; + std::stack visited_ids; int cur_id, i, nbr_size, nbr; visited_ids.push(orig); @@ -537,10 +537,10 @@ void AbstractClusterFactory::init() dest = nodes[nbr]; length = dist_matrix[orig->id][dest->id]; - if (access_dict.find(make_pair(i, nbr)) == access_dict.end()) { + if (access_dict.find(std::make_pair(i, nbr)) == access_dict.end()) { edges.push_back(new Edge(orig, dest, length)); - access_dict[make_pair(i, nbr)] = true; - access_dict[make_pair(nbr, i)] = true; + access_dict[std::make_pair(i, nbr)] = true; + access_dict[std::make_pair(nbr, i)] = true; } this->dist_dict[i][nbr] = length; } @@ -567,7 +567,7 @@ void AbstractClusterFactory::Partitioning(int k) while (!sub_trees.empty() && sub_trees.size() < k) { Tree* tmp_tree = sub_trees.top(); - //cout << tmp_tree->ssd_reduce << endl; + //cout << tmp_tree->ssd_reduce << std::endl; sub_trees.pop(); if (tmp_tree->ssd == 0) { @@ -642,10 +642,10 @@ void Skater::Clustering() boost::unordered_map, bool> access_dict; for (int i=0; i, Edge*> edge_dict; for (int i=0; iorig->id, e->dest->id)] = e; - edge_dict[make_pair(e->dest->id, e->orig->id)] = e; + edge_dict[std::make_pair(e->orig->id, e->dest->id)] = e; + edge_dict[std::make_pair(e->dest->id, e->orig->id)] = e; } //https://github.com/vinecopulib/vinecopulib/issues/22 @@ -680,7 +680,7 @@ void Skater::Clustering() } } - //cout << "Skater mst sum length:" << sum_length << endl; + //cout << "Skater mst sum length:" << sum_length << std::endl; for (int i=0; iorig->id; @@ -747,7 +747,7 @@ void FirstOrderSLKRedCap::Clustering() break; } } - //cout << "FO-SLK mst sum length:" << sum_length << endl; + //cout << "FO-SLK mst sum length:" << sum_length << std::endl; boost::unordered_map id_dict; for (int i=0; iordered_edges.resize(num_nodes-1); @@ -1030,7 +1030,7 @@ void FullOrderALKRedCap::Clustering() } } - //cout << "cnt: " << cnt << endl; + //cout << "cnt: " << cnt << std::endl; boost::unordered_map id_dict; @@ -1185,7 +1185,7 @@ void FullOrderWardRedCap::Clustering() edges_copy[i] = edges[i]; } - //cout << "# edges:" << num_edges << endl; + //cout << "# edges:" << num_edges << std::endl; this->ordered_edges.resize(num_nodes-1); @@ -1336,7 +1336,7 @@ void FullOrderWardRedCap::Clustering() } } - //cout << "cnt: " << cnt << endl; + //cout << "cnt: " << cnt << std::endl; boost::unordered_map id_dict; diff --git a/Algorithms/redcap.h b/Algorithms/redcap.h index b972f9877..8efd19c9c 100644 --- a/Algorithms/redcap.h +++ b/Algorithms/redcap.h @@ -102,7 +102,7 @@ namespace SpanningTreeClustering { n2 = nbr; e2 = e; } else { - //cout << "AddNeighbor() > 2" << endl; + //cout << "AddNeighbor() > 2" << std::endl; } } }; diff --git a/Algorithms/skater.cpp b/Algorithms/skater.cpp index 033376520..9667b2355 100644 --- a/Algorithms/skater.cpp +++ b/Algorithms/skater.cpp @@ -16,7 +16,7 @@ #include "../GenUtils.h" #include "skater.h" -Skater::Skater(int _num_obs, int _num_vars, int _num_clusters, double** _data, vector >& dist_matrix, bool _check_floor, double _floor, double* _floor_variable) +Skater::Skater(int _num_obs, int _num_vars, int _num_clusters, double** _data, std::vector >& dist_matrix, bool _check_floor, double _floor, double* _floor_variable) : num_obs(_num_obs), num_vars(_num_vars), num_clusters(_num_clusters),data(_data), check_floor(_check_floor), floor(_floor), floor_variable(_floor_variable) { BGraph g(num_obs); @@ -39,7 +39,7 @@ Skater::~Skater() } -void Skater::run_threads(vector tree, vector& scores, vector > >& cids, vector& candidates) +void Skater::run_threads(std::vector tree, std::vector& scores, std::vector > >& cids, std::vector& candidates) { int n_jobs = tree.size(); @@ -69,21 +69,21 @@ void Skater::run_threads(vector tree, vector& scores, vector > Skater::GetRegions() +std::vector > Skater::GetRegions() { - vector > regions; + std::vector > regions; PriorityQueue::iterator begin = solution.begin(); PriorityQueue::iterator end = solution.end(); - set::iterator set_it; + std::set::iterator set_it; for (PriorityQueue::iterator it = begin; it != end; ++it) { - const vector& c = (*it).second; - set ids; + const std::vector& c = (*it).second; + std::set ids; for (int i=0; i< c.size(); i++) { ids.insert(c[i].first); ids.insert(c[i].second); } - vector reg; + std::vector reg; for (set_it=ids.begin(); set_it!=ids.end(); set_it++) { reg.push_back(*set_it); } @@ -100,14 +100,14 @@ void Skater::run() while (solution.size() < num_clusters) { const ClusterEl& cluster = solution.top(); - vector tree = cluster.second; + std::vector tree = cluster.second; double sswt = ssw(tree); // check where to split int tree_size = tree.size(); - vector scores(tree_size); - vector > > cids(tree_size); - vector candidates(tree_size); + std::vector scores(tree_size); + std::vector > > cids(tree_size); + std::vector candidates(tree_size); //prunecost(tree, 0, tree_size-1, scores, cids, candidates); run_threads(tree, scores, cids, candidates); @@ -118,7 +118,7 @@ void Skater::run() // check where to split double best_score = scores[0]; - vector > best_cids = cids[0]; + std::vector > best_cids = cids[0]; ClusterPair best_pair = candidates[0]; for (int i=1; i scores1(t1_size); - vector > > cids1(t1_size); - vector cand1(t1_size); + std::vector scores1(t1_size); + std::vector > > cids1(t1_size); + std::vector cand1(t1_size); run_threads(best_pair[0], scores1, cids1, cand1); double best_score_1 = DBL_MAX; for (int i=0; i& tmp_set = best_cids[0]; + std::set& tmp_set = best_cids[0]; int tmp_id = *tmp_set.begin(); E tmp_e(tmp_id, tmp_id); best_pair[0].push_back(tmp_e); @@ -157,9 +157,9 @@ void Skater::run() // subtree 2 int t2_size = best_pair[1].size(); - vector scores2(t2_size); - vector > > cids2(t2_size); - vector cand2(t2_size); + std::vector scores2(t2_size); + std::vector > > cids2(t2_size); + std::vector cand2(t2_size); run_threads(best_pair[1], scores2, cids2, cand2); double best_score_2 = DBL_MAX; for (int i=0; i& tmp_set = best_cids[1]; + std::set& tmp_set = best_cids[1]; if (!tmp_set.empty()) { int tmp_id = *tmp_set.begin(); E tmp_e(tmp_id, tmp_id); @@ -180,7 +180,7 @@ void Skater::run() } } -void Skater::prunecost(vector tree, int start, int end, vector& scores, vector > >& cids, vector& candidates) +void Skater::prunecost(std::vector tree, int start, int end, std::vector& scores, std::vector > >& cids, std::vector& candidates) { //prune mst by removing one edge and get the best cut @@ -191,8 +191,8 @@ void Skater::prunecost(vector tree, int start, int end, vector& score tree.insert(tree.begin(), e_i); // prune tree to get two groups - set vex1, vex2; - vector part1, part2; + std::set vex1, vex2; + std::vector part1, part2; prunemst(tree, vex1, vex2, part1, part2); // compute objective function @@ -209,7 +209,7 @@ void Skater::prunecost(vector tree, int start, int end, vector& score } if (valid) { - vector > pts; + std::vector > pts; pts.push_back(vex1); pts.push_back(vex2); cids[i] = pts; @@ -242,9 +242,9 @@ void Skater::get_MST(const BGraph &in) } } -double Skater::ssw(vector& cluster) +double Skater::ssw(std::vector& cluster) { - set ids; + std::set ids; for (int i=0; i& cluster) return ssw(ids); } -double Skater::ssw(set& ids) +double Skater::ssw(std::set& ids) { // This function computes the sum of dissimilarity between each // observation and the mean (scalar of vector) of the observations. // sum((x_i - x_min)^2) double n = ids.size(); - vector means(num_vars); - set::iterator it; + std::vector means(num_vars); + std::set::iterator it; for (int c=0; c& ids) return ssw_val; } -bool Skater::bound_check(set& cluster) +bool Skater::bound_check(std::set& cluster) { - set::iterator it; + std::set::iterator it; double sum=0; for (it=cluster.begin(); it!=cluster.end(); it++) { int i = *it; @@ -300,14 +300,14 @@ bool Skater::bound_check(set& cluster) // This function deletes a first edge and makes two subsets of edges. Each // subset is a Minimun Spanning Treee. -void Skater::prunemst(vector& edges, set& set1, set& set2, vector& part1, vector& part2) +void Skater::prunemst(std::vector& edges, std::set& set1, std::set& set2, std::vector& part1, std::vector& part2) { // first edge is going to be removed int num_edges = edges.size(); int i, j, n1=1, li=0, ls=1; - vector no1(num_edges); - vector gr(num_edges); + std::vector no1(num_edges); + std::vector gr(num_edges); //no1[0] = e1[0]; no1[0] = edges[0].first; diff --git a/Algorithms/skater.h b/Algorithms/skater.h index 80ab1ff96..d0a221f34 100644 --- a/Algorithms/skater.h +++ b/Algorithms/skater.h @@ -13,7 +13,6 @@ #include -using namespace std; using namespace boost; typedef std::pair E; @@ -21,7 +20,7 @@ typedef std::pair E; struct CompareCluster { public: - bool operator() (const pair > & lhs, const pair > & rhs) const + bool operator() (const std::pair > & lhs, const std::pair > & rhs) const { return lhs.first < rhs.first; } @@ -42,11 +41,11 @@ typedef heap::priority_queue > Priority class Skater { public: Skater(int num_obs, int num_vars, int num_clusters, double** _data, - vector >& dist_matrix, + std::vector >& dist_matrix, bool check_floor, double floor, double* floor_variable); ~Skater(); - vector > GetRegions(); + std::vector > GetRegions(); protected: int num_obs; @@ -56,7 +55,7 @@ class Skater { bool check_floor; double floor; double* floor_variable; - vector mst_edges; + std::vector mst_edges; heap::priority_queue > solution; @@ -64,17 +63,17 @@ class Skater { void run(); - void run_threads(vector tree, vector& scores, vector > >& cids, vector& candidates); + void run_threads(std::vector tree, std::vector& scores, std::vector > >& cids, std::vector& candidates); - void prunecost(vector tree, int start, int end, vector& scores, vector > >& cids, vector& candidates); + void prunecost(std::vector tree, int start, int end, std::vector& scores, std::vector > >& cids, std::vector& candidates); - void prunemst(vector& edges, set& vex1, set& vex2, vector& part1, vector& part2); + void prunemst(std::vector& edges, std::set& vex1, std::set& vex2, std::vector& part1, std::vector& part2); - double ssw(vector& cluster); + double ssw(std::vector& cluster); - double ssw(set& ids); + double ssw(std::set& ids); - bool bound_check(set& cluster); + bool bound_check(std::set& cluster); }; #endif diff --git a/Algorithms/spectral.cpp b/Algorithms/spectral.cpp index f7f4a33b2..722212d73 100644 --- a/Algorithms/spectral.cpp +++ b/Algorithms/spectral.cpp @@ -23,7 +23,6 @@ #include "DataUtils.h" using namespace Eigen; -using namespace std; using namespace Spectra; Spectral::~Spectral() @@ -250,7 +249,7 @@ bool Spectral::call_symeigshiftssolver(MatrixXd& L) return false; } -static bool inline eigen_greater(const pair& a, const pair& b) +static bool inline eigen_greater(const std::pair& a, const std::pair& b) { return a.first > b.first; } @@ -285,14 +284,14 @@ void Spectral::eigendecomposition(bool raw_matrix) eigenvectors = edecomp.eigenvectors().real(); cumulative.resize(eigenvalues.rows()); - vector > eigen_pairs; + std::vector > eigen_pairs; double c = 0.0; for(unsigned int i = 0; i < eigenvectors.cols(); i++){ if(normalise){ double norm = eigenvectors.col(i).norm(); eigenvectors.col(i) /= norm; } - eigen_pairs.push_back(make_pair(eigenvalues(i),eigenvectors.col(i))); + eigen_pairs.push_back(std::make_pair(eigenvalues(i),eigenvectors.col(i))); } // http://stackoverflow.com/questions/5122804/sorting-with-lambda sort(eigen_pairs.begin(),eigen_pairs.end(), eigen_greater); diff --git a/Algorithms/spectral.h b/Algorithms/spectral.h index d80180096..3b8074e2a 100644 --- a/Algorithms/spectral.h +++ b/Algorithms/spectral.h @@ -18,7 +18,6 @@ #include "../Weights/DistUtils.h" using namespace Eigen; -using namespace std; class Spectral{ diff --git a/BuildTools/ubuntu/install.sh b/BuildTools/ubuntu/install.sh index 2fef666ee..e1bd6f27a 100755 --- a/BuildTools/ubuntu/install.sh +++ b/BuildTools/ubuntu/install.sh @@ -5,9 +5,11 @@ set -e # prepare: BuildTools/ubuntu cd "$WORK_DIR" +mkdir -p o cd BuildTools cd ubuntu export GEODA_HOME=$PWD +echo $GEODA_HOME # Install libgdal export DEBIAN_FRONTEND=noninteractive diff --git a/BuildTools/ubuntu/package/DEBIAN/control_jammy b/BuildTools/ubuntu/package/DEBIAN/control_jammy index d846d38cf..ae803e4ad 100644 --- a/BuildTools/ubuntu/package/DEBIAN/control_jammy +++ b/BuildTools/ubuntu/package/DEBIAN/control_jammy @@ -4,7 +4,7 @@ Architecture: amd64 Priority: optional Section: graphics Installed-Size: 121795 -Depends: libgdal30, zlib1g, libexpat1, freeglut3, libreadline8, libgtk-3-0, libssl1.1, libwebkit2gtk-4.0-37 +Depends: libgdal30, zlib1g, libexpat1, freeglut3, libreadline8, libgtk-3-0, libssl3, libwebkit2gtk-4.0-37 Maintainer: Luc Anselin < anselin@uchicago.edu > Provides: geoda Homepage: http://spatial.uchicago.edu diff --git a/DataViewer/CustomClassifPtree.cpp b/DataViewer/CustomClassifPtree.cpp index 928ab8ee8..206cfb2df 100644 --- a/DataViewer/CustomClassifPtree.cpp +++ b/DataViewer/CustomClassifPtree.cpp @@ -64,7 +64,6 @@ void CustomClassifPtree::ReadPtree(const boost::property_tree::ptree& pt, { LOG_MSG("Entering CustomClassifPtree::ReadPtree"); using boost::property_tree::ptree; - using namespace std; cc.clear(); try { @@ -286,7 +285,6 @@ void CustomClassifPtree::WritePtree(boost::property_tree::ptree& pt, const wxString& proj_path) { using boost::property_tree::ptree; - using namespace std; try { ptree& subtree = pt.put("custom_classifications", ""); @@ -373,7 +371,6 @@ void CustomClassifPtree::SetCatClassifList(CatClassifManager* cc_manager) wxString CustomClassifPtree::ToStr() const { - using namespace std; wxString ss; BOOST_FOREACH(const CatClassifDef& c, cc) { ss << c.ToStr(); diff --git a/DataViewer/DataSource.cpp b/DataViewer/DataSource.cpp index ea08ecdf0..104177e7b 100644 --- a/DataViewer/DataSource.cpp +++ b/DataViewer/DataSource.cpp @@ -32,8 +32,6 @@ #include "DataSource.h" using boost::property_tree::ptree; -using namespace std; - //------------------------------------------------------------------------------ // IDataSource static functions @@ -340,7 +338,7 @@ void FileDataSource::ReadPtree(const ptree& pt, { try { //const ptree& subtree = pt.get_child("datasource"); - string type_str = pt.get("type"); + std::string type_str = pt.get("type"); ds_type = IDataSource::FindDataSourceType(type_str); if (ds_type == GdaConst::ds_unknown) { @@ -349,7 +347,7 @@ void FileDataSource::ReadPtree(const ptree& pt, throw GdaException(error_msg.mb_str()); } - wxString tmp(pt.get("path").c_str(), wxConvUTF8); + wxString tmp(pt.get("path").c_str(), wxConvUTF8); file_repository_path = tmp; file_repository_path = GenUtils::RestorePath(proj_path, file_repository_path); @@ -452,7 +450,7 @@ void WebServiceDataSource::ReadPtree(const ptree& pt, const wxString& proj_path) { try { - string type_str = pt.get("type"); + std::string type_str = pt.get("type"); ds_type = IDataSource::FindDataSourceType(type_str); if (ds_type == GdaConst::ds_unknown) { @@ -461,7 +459,7 @@ void WebServiceDataSource::ReadPtree(const ptree& pt, throw GdaException(error_msg.mb_str()); } - webservice_url = pt.get("url"); + webservice_url = pt.get("url"); } catch (std::exception &e) { throw GdaException(e.what()); @@ -614,7 +612,7 @@ void DBDataSource::ReadPtree(const ptree& pt, const wxString& proj_path) { try{ - string type_str = pt.get("type"); + std::string type_str = pt.get("type"); ds_type = IDataSource::FindDataSourceType(type_str); if (ds_type == GdaConst::ds_unknown) { @@ -623,11 +621,11 @@ void DBDataSource::ReadPtree(const ptree& pt, throw GdaException(error_msg.mb_str()); } - db_name = pt.get("db_name"); - db_host = pt.get("host"); - db_port = pt.get("port"); - db_user = pt.get("user"); - db_pwd = pt.get("pwd"); + db_name = pt.get("db_name"); + db_host = pt.get("host"); + db_port = pt.get("port"); + db_user = pt.get("user"); + db_pwd = pt.get("pwd"); } catch (std::exception &e) { throw GdaException(e.what()); } diff --git a/DataViewer/DataSource.h b/DataViewer/DataSource.h index 0d4c92e03..b05876c80 100644 --- a/DataViewer/DataSource.h +++ b/DataViewer/DataSource.h @@ -26,7 +26,6 @@ #include "../GdaConst.h" #include "../GdaException.h" -using namespace std; using boost::property_tree::ptree; /** diff --git a/DataViewer/DataViewerEditFieldPropertiesDlg.cpp b/DataViewer/DataViewerEditFieldPropertiesDlg.cpp index b8a45f158..d83b9f62b 100644 --- a/DataViewer/DataViewerEditFieldPropertiesDlg.cpp +++ b/DataViewer/DataViewerEditFieldPropertiesDlg.cpp @@ -33,7 +33,6 @@ #include "TableState.h" #include "DataViewerEditFieldPropertiesDlg.h" -using namespace std; namespace bt = boost::posix_time; @@ -464,29 +463,29 @@ void DataViewerEditFieldPropertiesDlg::OnCellChanging( wxGridEvent& ev ) int num_rows = table_int->GetNumberRows(); if (new_type == GdaConst::long64_type) { // get data from old - vector data(num_rows); + std::vector data(num_rows); table_int->GetColData(from_col, 0, data); table_int->SetColData(to_col, 0, data); field_grid->SetReadOnly(row, COL_DD, true); } else if (new_type == GdaConst::date_type || new_type == GdaConst::time_type || new_type == GdaConst::datetime_type) { - vector data(num_rows); + std::vector data(num_rows); table_int->GetColData(from_col, 0, data); table_int->SetColData(to_col, 0, data); field_grid->SetReadOnly(row, COL_DD, true); } else if (new_type == GdaConst::double_type) { - vector data(num_rows); + std::vector data(num_rows); table_int->GetColData(from_col, 0, data); table_int->SetColData(to_col, 0, data); field_grid->SetReadOnly(row, COL_DD, false); } else if (new_type == GdaConst::string_type) { - vector data(num_rows); + std::vector data(num_rows); table_int->GetColData(from_col, 0, data); table_int->SetColData(to_col, 0, data); field_grid->SetReadOnly(row, COL_DD, true); } - vector undefined(num_rows, false); + std::vector undefined(num_rows, false); table_int->GetColUndefined(from_col, 0, undefined); table_int->SetColUndefined(to_col, 0, undefined); @@ -839,9 +838,8 @@ void DataViewerEditFieldPropertiesDlg::UpdateLength(int row) void DataViewerEditFieldPropertiesDlg::UpdateTmStrMap() { - using namespace std; tm_str_map.clear(); - vector tm_strs; + std::vector tm_strs; table_int->GetTimeStrings(tm_strs); for (int t=0, tt=tm_strs.size(); tSetValue(layer_name); // get the unique field names, and fill to m_import_key (wxChoice) - map dbf_fn_freq; + std::map dbf_fn_freq; dups.clear(); dedup_to_id.clear(); @@ -344,8 +342,8 @@ void MergeTableDlg::OnExclListDClick( wxCommandEvent& ev) OnIncOneClick(ev); } -bool MergeTableDlg::CheckKeys(wxString key_name, vector& key_vec, - map& key_map) +bool MergeTableDlg::CheckKeys(wxString key_name, std::vector& key_vec, + std::map& key_map) { std::map > dup_dict; // value:[] @@ -384,11 +382,11 @@ bool MergeTableDlg::CheckKeys(wxString key_name, vector& key_vec, return true; } -vector MergeTableDlg:: -GetSelectedFieldNames(map& merged_fnames_dict) +std::vector MergeTableDlg:: +GetSelectedFieldNames(std::map& merged_fnames_dict) { - vector merged_field_names; - set dup_merged_field_names, bad_merged_field_names; + std::vector merged_field_names; + std::set dup_merged_field_names, bad_merged_field_names; bool case_sensitive = false;//project_s->IsFieldCaseSensitive(); for (int i=0, iend=m_include_list->GetCount(); i& undefs, int idx, int t) + std::vector& undefs, int idx, int t) { wxString f_name = table_int->GetColName(idx, t); int f_length = table_int->GetColLength(idx, t); @@ -459,19 +457,19 @@ CreateNewOGRColumn(int new_rows, TableInterface* table_int, if (f_type == GdaConst::long64_type) { _col = new OGRColumnInteger(f_name, f_length, f_decimal, new_rows); _col->SetUndefinedMarkers(undefs); - vector vals; + std::vector vals; table_int->GetColData(idx, t, vals); for(int i=0; iSetValueAt(i, vals[i]); } else if (f_type == GdaConst::double_type) { _col = new OGRColumnDouble(f_name, f_length, f_decimal, new_rows); _col->SetUndefinedMarkers(undefs); - vector vals; + std::vector vals; table_int->GetColData(idx, t, vals); for(int i=0; iSetValueAt(i, vals[i]); } else { _col = new OGRColumnString(f_name, f_length, f_decimal, new_rows); _col->SetUndefinedMarkers(undefs); - vector vals; + std::vector vals; table_int->GetColData(idx, t, vals); for(int i=0; iSetValueAt(i, vals[i]); } @@ -480,9 +478,9 @@ CreateNewOGRColumn(int new_rows, TableInterface* table_int, OGRColumn* MergeTableDlg::CreateNewOGRColumn(int new_rows, OGRLayerProxy* layer_proxy, - vector& undefs, + std::vector& undefs, wxString f_name, - map& idx2_dict) + std::map& idx2_dict) { int col_idx = layer_proxy->GetFieldPos(f_name); GdaConst::FieldType f_type = layer_proxy->GetFieldType(col_idx); @@ -520,7 +518,7 @@ OGRColumn* MergeTableDlg::CreateNewOGRColumn(int new_rows, // update OGRColumn using import layer_proxy[field_name] void MergeTableDlg::UpdateOGRColumn(OGRColumn* _col, OGRLayerProxy* layer_proxy, - wxString f_name, map& idx2_dict) + wxString f_name, std::map& idx2_dict) { int col_idx = layer_proxy->GetFieldPos(f_name); GdaConst::FieldType f_type = layer_proxy->GetFieldType(col_idx); @@ -558,7 +556,7 @@ void MergeTableDlg::OuterJoinMerge() wxString error_msg; // get selected field names from merging table - vector merged_field_names; + std::vector merged_field_names; for (int i=0, iend=m_include_list->GetCount(); iGetString(i); merged_field_names.push_back(inc_n); @@ -569,11 +567,11 @@ void MergeTableDlg::OuterJoinMerge() int n_rows = table_int->GetNumberRows(); //int n_merge_field = (int)merged_field_names.size(); - map rowid_map; + std::map rowid_map; - vector key1_vec; // keys from first table - map key1_map; // key-idx map from first table - vector key2_vec; // keys from second table + std::vector key1_vec; // keys from first table + std::map key1_map; // key-idx map from first table + std::vector key2_vec; // keys from second table if (m_key_val_rb->GetValue()==1) { // merge by key/record order checked @@ -588,7 +586,7 @@ void MergeTableDlg::OuterJoinMerge() throw GdaException(error_msg.mb_str()); } - vector key1_l_vec; // keys (int type) from first table + std::vector key1_l_vec; // keys (int type) from first table if (table_int->GetColType(col1_id, 0) == GdaConst::string_type) { table_int->GetColData(col1_id, 0, key1_vec); @@ -613,7 +611,7 @@ void MergeTableDlg::OuterJoinMerge() wxString key2_name = m_import_key->GetString(key2_id); int col2_id = merge_layer_proxy->GetFieldPos(key2_name); int n_merge_rows = merge_layer_proxy->GetNumRecords(); - map key2_map; + std::map key2_map; for (int i=0; i < n_merge_rows; i++) { wxString tmp = merge_layer_proxy->GetValueAt(i, col2_id, m_wx_encoding); @@ -673,8 +671,8 @@ void MergeTableDlg::OuterJoinMerge() } } std::vector new_geoms = geoms; - vector new_key_vec = key1_vec; - map idx2_dict; + std::vector new_key_vec = key1_vec; + std::map idx2_dict; int idx2 = (int)key1_vec.size(); for (int i=0; i undefs(new_rows, true); + std::vector undefs(new_rows, true); - map new_fields_dict; - vector new_fields; + std::map new_fields_dict; + std::vector new_fields; // all columns from table int time_steps = table_int->GetTimeSteps(); for ( int id=0; id < table_int->GetNumberCols(); id++ ) { @@ -778,12 +776,12 @@ void MergeTableDlg::LeftJoinMerge() wxString error_msg; // get selected field names from merging table - map merged_fnames_dict; - for (set::iterator it = dups.begin(); + std::map merged_fnames_dict; + for (std::set::iterator it = dups.begin(); it != dups.end(); ++it ) { merged_fnames_dict[ *it ] = *it; } - vector merged_field_names = + std::vector merged_field_names = GetSelectedFieldNames(merged_fnames_dict); if (merged_field_names.empty()) @@ -792,7 +790,7 @@ void MergeTableDlg::LeftJoinMerge() int n_rows = table_int->GetNumberRows(); int n_merge_field = (int)merged_field_names.size(); - map rowid_map; + std::map rowid_map; if (m_key_val_rb->GetValue()==1) { // check merge by key/record order // get and check keys from original table int key1_id = m_current_key->GetSelection(); @@ -803,9 +801,9 @@ void MergeTableDlg::LeftJoinMerge() throw GdaException(error_msg.mb_str()); } - vector key1_vec; - vector key1_l_vec; - map key1_map; + std::vector key1_vec; + std::vector key1_l_vec; + std::map key1_map; if ( table_int->GetColType(col1_id, 0) == GdaConst::string_type ) { table_int->GetColData(col1_id, 0, key1_vec); @@ -831,8 +829,8 @@ void MergeTableDlg::LeftJoinMerge() int col2_id = merge_layer_proxy->GetFieldPos(key2_name); if (col2_id == -1) col2_id = dedup_to_id[key2_name]; int n_merge_rows = merge_layer_proxy->GetNumRecords(); - vector key2_vec; - map key2_map; + std::vector key2_vec; + std::map key2_map; for (int i=0; i < n_merge_rows; i++) { key2_vec.push_back(merge_layer_proxy->GetValueAt(i, col2_id, m_wx_encoding)); @@ -843,7 +841,7 @@ void MergeTableDlg::LeftJoinMerge() // make sure key1 <= key2, and store their mappings int n_matches = 0; - map::iterator key1_it, key2_it; + std::map::iterator key1_it, key2_it; for (key1_it=key1_map.begin(); key1_it!=key1_map.end(); key1_it++) { key2_it = key2_map.find(key1_it->first); @@ -894,7 +892,7 @@ void MergeTableDlg::LeftJoinMerge() void MergeTableDlg::AppendNewField(wxString field_name, wxString real_field_name, int n_rows, - map& rowid_map) + std::map& rowid_map) { int fid = dedup_to_id[real_field_name]; GdaConst::FieldType ftype = merge_layer_proxy->GetFieldType(fid); @@ -905,8 +903,8 @@ void MergeTableDlg::AppendNewField(wxString field_name, if ( ftype == GdaConst::long64_type ) { int add_pos = table_int->InsertCol(ftype, field_name, init_pos, time_steps, field_len, decimals); - vector data(n_rows); - vector undefs(n_rows); + std::vector data(n_rows); + std::vector undefs(n_rows); for (int i=0; iInsertCol(ftype, field_name, init_pos, time_steps, field_len, decimals); - vector data(n_rows); - vector undefs(n_rows); + std::vector data(n_rows); + std::vector undefs(n_rows); for (int i=0; iInsertCol(ftype, field_name); - vector data(n_rows); - vector undefs(n_rows, false); + std::vector data(n_rows); + std::vector undefs(n_rows, false); for (int i=0; i& key_vec, std::map& key_map); - vector GetSelectedFieldNames(map& merged_fnames_dict); + std::vector GetSelectedFieldNames(std::map& merged_fnames_dict); void AppendNewField(wxString field_name, wxString real_field_name, int n_rows, std::map& rowid_map); - OGRColumn* CreateNewOGRColumn(int new_rows, TableInterface* table_int, vector& undefs, int idx, int t=0); + OGRColumn* CreateNewOGRColumn(int new_rows, TableInterface* table_int, std::vector& undefs, int idx, int t=0); - OGRColumn* CreateNewOGRColumn(int new_rows, OGRLayerProxy* layer_proxy, vector& undefs, wxString col_name, map& idx2_dict); + OGRColumn* CreateNewOGRColumn(int new_rows, OGRLayerProxy* layer_proxy, std::vector& undefs, wxString col_name, std::map& idx2_dict); - void UpdateOGRColumn(OGRColumn* _col, OGRLayerProxy* layer_proxy, wxString f_name, map& idx2_dict); + void UpdateOGRColumn(OGRColumn* _col, OGRLayerProxy* layer_proxy, wxString f_name, std::map& idx2_dict); DECLARE_EVENT_TABLE() }; diff --git a/DataViewer/OGRColumn.cpp b/DataViewer/OGRColumn.cpp index 4141071c2..ff765a197 100644 --- a/DataViewer/OGRColumn.cpp +++ b/DataViewer/OGRColumn.cpp @@ -38,7 +38,6 @@ #include "OGRColumn.h" #include "VarOrderMapper.h" -using namespace std; namespace bt = boost::posix_time; OGRColumn::OGRColumn(wxString name, int field_length, int decimals, int n_rows) @@ -140,111 +139,111 @@ bool OGRColumn::IsUndefined(int row) return undef_markers[row]; } -void OGRColumn::UpdateData(const vector &data) +void OGRColumn::UpdateData(const std::vector &data) { wxString msg = "Internal error: UpdateData(double) not implemented."; throw GdaException(msg.mb_str()); } -void OGRColumn::UpdateData(const vector &data) +void OGRColumn::UpdateData(const std::vector &data) { wxString msg = "Internal error: UpdateData(wxInt64) not implemented."; throw GdaException(msg.mb_str()); } -void OGRColumn::UpdateData(const vector &data) +void OGRColumn::UpdateData(const std::vector &data) { wxString msg = "Internal error: UpdateData(wxString) not implemented."; throw GdaException(msg.mb_str()); } -void OGRColumn::UpdateData(const vector &data) +void OGRColumn::UpdateData(const std::vector &data) { wxString msg = "Internal error: UpdateData(wxString) not implemented."; throw GdaException(msg.mb_str()); } -void OGRColumn::UpdateData(const vector &data, - const vector& undef_markers_) +void OGRColumn::UpdateData(const std::vector &data, + const std::vector& undef_markers_) { UpdateData(data); undef_markers = undef_markers_; } -void OGRColumn::UpdateData(const vector &data, - const vector& undef_markers_) +void OGRColumn::UpdateData(const std::vector &data, + const std::vector& undef_markers_) { UpdateData(data); undef_markers = undef_markers_; } -void OGRColumn::UpdateData(const vector &data, - const vector& undef_markers_) +void OGRColumn::UpdateData(const std::vector &data, + const std::vector& undef_markers_) { UpdateData(data); undef_markers = undef_markers_; } -void OGRColumn::UpdateData(const vector &data, - const vector& undef_markers_) +void OGRColumn::UpdateData(const std::vector &data, + const std::vector& undef_markers_) { UpdateData(data); undef_markers = undef_markers_; } -void OGRColumn::FillData(vector& data) +void OGRColumn::FillData(std::vector& data) { wxString msg = "Internal error: FillData(double) not implemented."; throw GdaException(msg.mb_str()); } -void OGRColumn::FillData(vector& data) +void OGRColumn::FillData(std::vector& data) { wxString msg = "Internal error: FillData(wxInt64) not implemented."; throw GdaException(msg.mb_str()); } -void OGRColumn::FillData(vector& data, wxCSConv* m_wx_encoding) +void OGRColumn::FillData(std::vector& data, wxCSConv* m_wx_encoding) { wxString msg = "Internal error: FillData(wxString) not implemented."; throw GdaException(msg.mb_str()); } -void OGRColumn::FillData(vector& data) +void OGRColumn::FillData(std::vector& data) { wxString msg = "Internal error: FillData(date) not implemented."; throw GdaException(msg.mb_str()); } -void OGRColumn::FillData(vector &data, - vector& undef_markers_) +void OGRColumn::FillData(std::vector &data, + std::vector& undef_markers_) { FillData(data); undef_markers_ = undef_markers; } -void OGRColumn::FillData(vector &data, - vector& undef_markers_) +void OGRColumn::FillData(std::vector &data, + std::vector& undef_markers_) { FillData(data); undef_markers_ = undef_markers; } -void OGRColumn::FillData(vector &data, - vector& undef_markers_, +void OGRColumn::FillData(std::vector &data, + std::vector& undef_markers_, wxCSConv* m_wx_encoding) { FillData(data); undef_markers_ = undef_markers; } -void OGRColumn::FillData(vector &data, - vector& undef_markers_) +void OGRColumn::FillData(std::vector &data, + std::vector& undef_markers_) { FillData(data); undef_markers_ = undef_markers; @@ -271,7 +270,7 @@ bool OGRColumn::GetCellValue(int row, wxString& val) } -void OGRColumn::UpdateNullMarkers(const vector& undef_markers_) +void OGRColumn::UpdateNullMarkers(const std::vector& undef_markers_) { if (!undef_markers_.empty()) undef_markers = undef_markers_; @@ -330,7 +329,7 @@ OGRColumnInteger::~OGRColumnInteger() } // Return this column to a vector of wxInt64 -void OGRColumnInteger::FillData(vector &data) +void OGRColumnInteger::FillData(std::vector &data) { if (is_new) { for (int i=0; i &data) } // Return this column to a vector of double -void OGRColumnInteger::FillData(vector &data) +void OGRColumnInteger::FillData(std::vector &data) { if (is_new) { for (int i=0; i &data) } // Return this column to a vector of wxString -void OGRColumnInteger::FillData(vector &data, wxCSConv* m_wx_encoding) +void OGRColumnInteger::FillData(std::vector &data, wxCSConv* m_wx_encoding) { if (is_new) { for (int i=0; i &data, wxCSConv* m_wx_encoding) } // Update this column from a vector of wxInt64 -void OGRColumnInteger::UpdateData(const vector& data) +void OGRColumnInteger::UpdateData(const std::vector& data) { if (is_new) { for (int i=0; i& data) } } -void OGRColumnInteger::UpdateData(const vector& data) +void OGRColumnInteger::UpdateData(const std::vector& data) { if (is_new) { for (int i=0; i &data) +void OGRColumnDouble::FillData(std::vector &data) { if (is_new) { for (int i=0; i &data) } // Assign this column to a vector of double -void OGRColumnDouble::FillData(vector &data) +void OGRColumnDouble::FillData(std::vector &data) { if (is_new) { for (int i=0; i &data) } } -void OGRColumnDouble::FillData(vector &data, wxCSConv* m_wx_encoding) +void OGRColumnDouble::FillData(std::vector &data, wxCSConv* m_wx_encoding) { if (is_new) { for (int i=0; i &data, wxCSConv* m_wx_encoding) } // Update this column from a vector of double -void OGRColumnDouble::UpdateData(const vector& data) +void OGRColumnDouble::UpdateData(const std::vector& data) { if (is_new) { for (int i=0; i& data) } } -void OGRColumnDouble::UpdateData(const vector& data) +void OGRColumnDouble::UpdateData(const std::vector& data) { if (is_new) { for (int i=0; i vector -void OGRColumnString::FillData(vector& data) +// This column -> std::vector +void OGRColumnString::FillData(std::vector& data) { const char* thousand_sep = CPLGetConfigOption("GEODA_LOCALE_SEPARATOR", ","); const char* decimal_sep = CPLGetConfigOption("GEODA_LOCALE_DECIMAL", "."); @@ -833,8 +832,8 @@ void OGRColumnString::FillData(vector& data) } } -// This column -> vector -void OGRColumnString::FillData(vector &data) +// This column -> std::vector +void OGRColumnString::FillData(std::vector &data) { const char* thousand_sep = CPLGetConfigOption("GEODA_LOCALE_SEPARATOR", ","); const char* decimal_sep = CPLGetConfigOption("GEODA_LOCALE_DECIMAL", "."); @@ -879,8 +878,8 @@ void OGRColumnString::FillData(vector &data) } } -// This column -> vector -void OGRColumnString::FillData(vector &data, wxCSConv* m_wx_encoding) +// This column -> std::vector +void OGRColumnString::FillData(std::vector &data, wxCSConv* m_wx_encoding) { if (is_new) { for (int i=0; i &data, wxCSConv* m_wx_encoding) } // for date/time -void OGRColumnString::FillData(vector& data) +void OGRColumnString::FillData(std::vector& data) { if (is_new) { wxString test_s = new_data[0]; test_s.Trim(true).Trim(false); - vector date_items; + std::vector date_items; wxString pattern = Gda::DetectDateFormat(test_s, date_items); if (pattern.IsEmpty()) { wxString error_msg = wxString::Format("Fill data error: can't convert '%s' to date/time.", test_s); @@ -921,7 +920,7 @@ void OGRColumnString::FillData(vector& data) int col_idx = GetColIndex(); wxString test_s = ogr_layer->data[0]->GetFieldAsString(col_idx); test_s.Trim(true).Trim(false); - vector date_items; + std::vector date_items; wxString pattern = Gda::DetectDateFormat(test_s, date_items); if (pattern.IsEmpty()) { @@ -944,8 +943,8 @@ void OGRColumnString::FillData(vector& data) } } -// vector -> this column -void OGRColumnString::UpdateData(const vector& data) +// std::vector -> this column +void OGRColumnString::UpdateData(const std::vector& data) { if (is_new) { for (int i=0; i& data) } } -void OGRColumnString::UpdateData(const vector& data) +void OGRColumnString::UpdateData(const std::vector& data) { if (is_new) { for (int i=0; i& data) } } -void OGRColumnString::UpdateData(const vector& data) +void OGRColumnString::UpdateData(const std::vector& data) { if (is_new) { for (int i=0; i 0 ) new_data.clear(); } -void OGRColumnDate::FillData(vector &data) +void OGRColumnDate::FillData(std::vector &data) { if (is_new) { for (int i=0; i &data) } } -void OGRColumnDate::FillData(vector &data) +void OGRColumnDate::FillData(std::vector &data) { if (is_new) { for (int i=0; i &data) } } -void OGRColumnDate::FillData(vector &data, wxCSConv* m_wx_encoding) +void OGRColumnDate::FillData(std::vector &data, wxCSConv* m_wx_encoding) { int year, month, day, hour, minute, second, tzflag; if (is_new) { @@ -1215,7 +1214,7 @@ void OGRColumnDate::FillData(vector &data, wxCSConv* m_wx_encoding) } } -void OGRColumnDate::UpdateData(const vector &data) +void OGRColumnDate::UpdateData(const std::vector &data) { if (is_new) { for (int i=0; i date_items; + std::vector date_items; wxString pattern = Gda::DetectDateFormat(_value, date_items); wxRegEx regex; regex.Compile(pattern); @@ -1390,7 +1389,7 @@ void OGRColumnTime::SetValueAt(int row_idx, const wxString &value, } wxString _value = value; _value.Trim(true).Trim(false); - vector date_items; + std::vector date_items; wxString pattern = Gda::DetectDateFormat(_value, date_items); wxRegEx regex; regex.Compile(pattern); @@ -1475,7 +1474,7 @@ void OGRColumnDateTime::SetValueAt(int row_idx, const wxString &value, } wxString _value = value; _value.Trim(true).Trim(false); - vector date_items; + std::vector date_items; wxString pattern = Gda::DetectDateFormat(_value, date_items); wxRegEx regex; regex.Compile(pattern); diff --git a/DataViewer/OGRColumn.h b/DataViewer/OGRColumn.h index 6e0162ffa..e84219db5 100644 --- a/DataViewer/OGRColumn.h +++ b/DataViewer/OGRColumn.h @@ -30,7 +30,6 @@ #include "../DataViewer/VarOrderMapper.h" #include "../ShapeOperations/OGRLayerProxy.h" -using namespace std; namespace bt = boost::posix_time; /** @@ -48,7 +47,7 @@ class OGRColumn int rows; OGRLayerProxy* ogr_layer; // markers for a new column if the cell has ben assigned a value - vector undef_markers; + std::vector undef_markers; int get_date_format(std::string& s); public: @@ -62,8 +61,8 @@ class OGRColumn // Get column index from loaded ogr_layer int GetColIndex(); - void SetUndefinedMarkers(vector& undefs) {undef_markers = undefs;} - vector GetUndefinedMarkers() { return undef_markers;} + void SetUndefinedMarkers(std::vector& undefs) {undef_markers = undefs;} + std::vector GetUndefinedMarkers() { return undef_markers;} // When SaveAs current datasource to a new datasource, the underneath OGRLayer will be replaced. void UpdateOGRLayer(OGRLayerProxy* new_ogr_layer); @@ -98,44 +97,44 @@ class OGRColumn virtual GdaConst::FieldType GetType() {return GdaConst::unknown_type;} - virtual void UpdateData(const vector& data); - virtual void UpdateData(const vector& data); - virtual void UpdateData(const vector& data); - virtual void UpdateData(const vector& data); + virtual void UpdateData(const std::vector& data); + virtual void UpdateData(const std::vector& data); + virtual void UpdateData(const std::vector& data); + virtual void UpdateData(const std::vector& data); // following UpdateData will be used for any undefined/null values - virtual void UpdateData(const vector& data, - const vector& undef_markers); - virtual void UpdateData(const vector& data, - const vector& undef_markers); - virtual void UpdateData(const vector& data, - const vector& undef_markers); - virtual void UpdateData(const vector& data, - const vector& undef_markers); + virtual void UpdateData(const std::vector& data, + const std::vector& undef_markers); + virtual void UpdateData(const std::vector& data, + const std::vector& undef_markers); + virtual void UpdateData(const std::vector& data, + const std::vector& undef_markers); + virtual void UpdateData(const std::vector& data, + const std::vector& undef_markers); // Should return true, unless if a undefined value is found virtual bool GetCellValue(int row, wxInt64& val); virtual bool GetCellValue(int row, double& val); virtual bool GetCellValue(int row, wxString& val); - virtual void UpdateNullMarkers(const vector& set_markers); + virtual void UpdateNullMarkers(const std::vector& set_markers); // interfaces for TableInterface - virtual void FillData(vector& data); - virtual void FillData(vector& data); - virtual void FillData(vector& data, + virtual void FillData(std::vector& data); + virtual void FillData(std::vector& data); + virtual void FillData(std::vector& data, wxCSConv* m_wx_encoding = NULL); - virtual void FillData(vector& data); - - virtual void FillData(vector& data, - vector& undef_markers); - virtual void FillData(vector& data, - vector& undef_markers); - virtual void FillData(vector& datam, - vector& undef_markers, + virtual void FillData(std::vector& data); + + virtual void FillData(std::vector& data, + std::vector& undef_markers); + virtual void FillData(std::vector& data, + std::vector& undef_markers); + virtual void FillData(std::vector& datam, + std::vector& undef_markers, wxCSConv* m_wx_encoding = NULL); - virtual void FillData(vector& datam, - vector& undef_markers); + virtual void FillData(std::vector& datam, + std::vector& undef_markers); virtual wxString GetValueAt(int row_idx, int disp_decimals=0, @@ -152,7 +151,7 @@ class OGRColumn class OGRColumnInteger : public OGRColumn { private: - vector new_data; + std::vector new_data; void InitMemoryData(); public: @@ -167,15 +166,15 @@ class OGRColumnInteger : public OGRColumn virtual GdaConst::FieldType GetType() {return GdaConst::long64_type;} - virtual void FillData(vector& data); + virtual void FillData(std::vector& data); - virtual void FillData(vector& data); + virtual void FillData(std::vector& data); - virtual void FillData(vector& data, wxCSConv* m_wx_encoding=NULL); + virtual void FillData(std::vector& data, wxCSConv* m_wx_encoding=NULL); - virtual void UpdateData(const vector& data); + virtual void UpdateData(const std::vector& data); - virtual void UpdateData(const vector& data); + virtual void UpdateData(const std::vector& data); virtual bool GetCellValue(int row, wxInt64& val); @@ -195,7 +194,7 @@ class OGRColumnInteger : public OGRColumn class OGRColumnDouble : public OGRColumn { private: - vector new_data; + std::vector new_data; void InitMemoryData(); public: @@ -210,15 +209,15 @@ class OGRColumnDouble : public OGRColumn virtual GdaConst::FieldType GetType() {return GdaConst::double_type;} - virtual void FillData(vector& data); + virtual void FillData(std::vector& data); - virtual void FillData(vector& data); + virtual void FillData(std::vector& data); - virtual void FillData(vector& data, wxCSConv* m_wx_encodin = NULL); + virtual void FillData(std::vector& data, wxCSConv* m_wx_encodin = NULL); - virtual void UpdateData(const vector& data); + virtual void UpdateData(const std::vector& data); - virtual void UpdateData(const vector& data); + virtual void UpdateData(const std::vector& data); virtual bool GetCellValue(int row, double& val); @@ -238,7 +237,7 @@ class OGRColumnDouble : public OGRColumn class OGRColumnString : public OGRColumn { private: - vector new_data; + std::vector new_data; void InitMemoryData(); @@ -255,19 +254,19 @@ class OGRColumnString : public OGRColumn virtual GdaConst::FieldType GetType() {return GdaConst::string_type;} - virtual void FillData(vector& data); + virtual void FillData(std::vector& data); - virtual void FillData(vector& data); + virtual void FillData(std::vector& data); - virtual void FillData(vector& data, wxCSConv* m_wx_encodin = NULL); + virtual void FillData(std::vector& data, wxCSConv* m_wx_encodin = NULL); - virtual void FillData(vector& data); + virtual void FillData(std::vector& data); - virtual void UpdateData(const vector& data); + virtual void UpdateData(const std::vector& data); - virtual void UpdateData(const vector& data); + virtual void UpdateData(const std::vector& data); - virtual void UpdateData(const vector& data); + virtual void UpdateData(const std::vector& data); virtual bool GetCellValue(int row, wxString& val); @@ -285,7 +284,7 @@ class OGRColumnString : public OGRColumn class OGRColumnDate: public OGRColumn { protected: - vector new_data; + std::vector new_data; void InitMemoryData(); public: @@ -294,13 +293,13 @@ class OGRColumnDate: public OGRColumn OGRColumnDate(OGRLayerProxy* ogr_layer, wxString name, int field_length, int decimals); virtual ~OGRColumnDate(); - virtual void FillData(vector& data); + virtual void FillData(std::vector& data); - virtual void FillData(vector& data, wxCSConv* m_wx_encoding = NULL); + virtual void FillData(std::vector& data, wxCSConv* m_wx_encoding = NULL); - virtual void FillData(vector& data); + virtual void FillData(std::vector& data); - virtual void UpdateData(const vector& data); + virtual void UpdateData(const std::vector& data); virtual GdaConst::FieldType GetType() {return GdaConst::date_type;} diff --git a/DataViewer/OGRTable.cpp b/DataViewer/OGRTable.cpp index a8b65aedf..de35e9db1 100644 --- a/DataViewer/OGRTable.cpp +++ b/DataViewer/OGRTable.cpp @@ -39,8 +39,6 @@ #include "OGRTableOperation.h" #include "VarOrderMapper.h" -using namespace std; - OGRTable::OGRTable(int n_rows) : TableInterface(NULL, NULL) { @@ -636,10 +634,10 @@ void OGRTable::GetColData(int col, GdaFlexValue& data) || !IsColNumeric(col)) return; VarGroup vg = var_order.FindVarGroup(col); if (vg.IsEmpty()) return; - vector vars; + std::vector vars; vg.GetVarNames(vars); size_t tms = vars.size(); - vector ftr_c(tms); // OGRFeature column id + std::vector ftr_c(tms); // OGRFeature column id for (size_t t=0; t vars; + std::vector vars; vg.GetVarNames(vars); size_t tms = vars.size(); - vector ftr_c(tms); // OGRFeature column id + std::vector ftr_c(tms); // OGRFeature column id for (size_t t=0; t vars; + std::vector vars; vg.GetVarNames(vars); size_t tms = vars.size(); - vector ftr_c(tms); // OGRFeature column id + std::vector ftr_c(tms); // OGRFeature column id for (size_t t=0; t vars; + std::vector vars; vg.GetVarNames(vars); size_t tms = vars.size(); - vector ftr_c(tms); // OGRFeature column id + std::vector ftr_c(tms); // OGRFeature column id for (size_t t=0; t vars; + std::vector vars; vg.GetVarNames(vars); size_t tms = vars.size(); - vector ftr_c(tms); // OGRFeature column id + std::vector ftr_c(tms); // OGRFeature column id for (size_t t=0; t& undefined) * min_vals, max_vals: the values of same column at different time steps * */ -void OGRTable::GetMinMaxVals(int col, vector& min_vals, - vector& max_vals) +void OGRTable::GetMinMaxVals(int col, std::vector& min_vals, + std::vector& max_vals) { if (col < 0 || col >= GetNumberCols()) return; if (!IsColNumeric(col)) return; @@ -972,14 +970,14 @@ void OGRTable::GetMinMaxVals(int col, vector& min_vals, if (vg.IsEmpty()) return; int times = vg.GetNumTms(); - vector vars; + std::vector vars; vg.GetVarNames(vars); for (size_t t=0; t data(rows, 0); - vector undef(rows, false); + std::vector data(rows, 0); + std::vector undef(rows, false); columns[col_idx]->FillData(data, undef); bool has_init = false; for (size_t i=0; i names(SuggestDBColNames(name, name, time_steps)); + std::vector names(SuggestDBColNames(name, name, time_steps)); // return could be group of names (e.g. pop2001, pop2002, pop2003) for (size_t t=0; t::iterator iter = org_var_names.begin() + pos; + std::vector::iterator iter = org_var_names.begin() + pos; org_var_names.insert(iter, names[t]); } // when init a column, set display decimals to -1 so that UI will determine @@ -1411,7 +1409,7 @@ void OGRTable::UngroupCol(int col) if (col < 0 || col >= var_order.GetNumVarGroups()) return; if (GetColTimeSteps(col) <= 1) return; - map nm_to_fi; + std::map nm_to_fi; for (size_t t=0; t columns; + std::vector columns; VarOrderMapper var_order; // may contains duplicated variable names e.g. in csv file - vector org_var_names; + std::vector org_var_names; // queues of table operations - queue operations_queue; - stack completed_stack; + std::queue operations_queue; + std::stack completed_stack; void AddTimeIDs(int n); int FindOGRColId(int wxgrid_col_pos, int time); @@ -183,7 +182,7 @@ class OGRTable : public TableInterface, TableStateObserver int field_len=-1, int decimals=-1); virtual bool DeleteCol(int pos); virtual void UngroupCol(int col); - virtual void GroupCols(const vector& cols, + virtual void GroupCols(const std::vector& cols, const wxString& name, int pos=0); virtual void InsertTimeStep(int time, const wxString& name); virtual void RemoveTimeStep(int time); diff --git a/DataViewer/OGRTableOperation.cpp b/DataViewer/OGRTableOperation.cpp index 5f899accd..c71518f57 100644 --- a/DataViewer/OGRTableOperation.cpp +++ b/DataViewer/OGRTableOperation.cpp @@ -68,7 +68,7 @@ OGRTableOpDeleteColumn::OGRTableOpDeleteColumn(OGRColumn* col) OGRTableOpDeleteColumn::~OGRTableOpDeleteColumn() { - // When OGRColumn was erased from vector, the actual memory of + // When OGRColumn was erased from std::vector, the actual memory of // erased OGRColumn is still there for future committing/rollingback. Once // the operation is done, we need to clean this piece of memory. if (ogr_col!= NULL) { @@ -89,7 +89,7 @@ void OGRTableOpDeleteColumn::Rollback() // add the deteled column back to OGRTable if (ogr_col->IsNewColumn()) { // just mark deletion back, and add column back to - // vector + // std::vector ogr_col->SetDeletion(false); } else { // append deleted column back to table @@ -102,15 +102,15 @@ void OGRTableOpDeleteColumn::Rollback() GdaConst::FieldType type = ogr_col->GetType(); int n_rows = ogr_col->GetNumRows(); if ( type == GdaConst::long64_type){ - vector col_data; - vector undefs; + std::vector col_data; + std::vector undefs; ogr_col->FillData(col_data, undefs); for (int i=0; iSetValueAt(i, pos, (GIntBig)col_data[i]); } } else if ( type == GdaConst::double_type){ - vector col_data; - vector undefs; + std::vector col_data; + std::vector undefs; ogr_col->FillData(col_data, undefs); for (int i=0; iSetValueAt(i, pos, col_data[i]); @@ -119,8 +119,8 @@ void OGRTableOpDeleteColumn::Rollback() type == GdaConst::time_type || type == GdaConst::datetime_type ){ - vector col_data; - vector undefs; + std::vector col_data; + std::vector undefs; ogr_col->FillData(col_data, undefs); for (int i=0; iSetValueAt(i, pos, year, month, day, hour, minute, second); } } else { - vector col_data; - vector undefs; + std::vector col_data; + std::vector undefs; ogr_col->FillData(col_data, undefs); for (int i=0; iSetValueAt(i, pos, col_data[i].mb_str()); diff --git a/DataViewer/OGRTableOperation.h b/DataViewer/OGRTableOperation.h index 746eb8270..3a70548d8 100644 --- a/DataViewer/OGRTableOperation.h +++ b/DataViewer/OGRTableOperation.h @@ -26,8 +26,6 @@ namespace bt = boost::posix_time; -using namespace std; - /** * OGRTableOperation * OGRTableOpInsertColumn @@ -121,17 +119,17 @@ class OGRTableOpUpdateColumn : public OGRTableOperation private: int n_rows; - vector undef_old_data, undef_new_data; - vector d_old_data, d_new_data; - vector l_old_data, l_new_data; - vector s_old_data, s_new_data; - vector t_old_data, t_new_data; + std::vector undef_old_data, undef_new_data; + std::vector d_old_data, d_new_data; + std::vector l_old_data, l_new_data; + std::vector s_old_data, s_new_data; + std::vector t_old_data, t_new_data; public: - OGRTableOpUpdateColumn(OGRColumn* col, const vector& new_data); - OGRTableOpUpdateColumn(OGRColumn* col, const vector& new_data); - OGRTableOpUpdateColumn(OGRColumn* col, const vector& new_data); - OGRTableOpUpdateColumn(OGRColumn* col, const vector& new_data); + OGRTableOpUpdateColumn(OGRColumn* col, const std::vector& new_data); + OGRTableOpUpdateColumn(OGRColumn* col, const std::vector& new_data); + OGRTableOpUpdateColumn(OGRColumn* col, const std::vector& new_data); + OGRTableOpUpdateColumn(OGRColumn* col, const std::vector& new_data); ~OGRTableOpUpdateColumn(){} virtual void Commit(); diff --git a/DataViewer/TableBase.cpp b/DataViewer/TableBase.cpp index b30535fe8..f88cb34a5 100644 --- a/DataViewer/TableBase.cpp +++ b/DataViewer/TableBase.cpp @@ -876,7 +876,6 @@ void TableBase::update(HLStateInt* o) void TableBase::update(TableState* o) { - using namespace std; if (!GetView()) return; if (o->GetEventType() == TableState::cols_delta) { diff --git a/DataViewer/TableFrame.cpp b/DataViewer/TableFrame.cpp index 08e14164f..d83499e2d 100644 --- a/DataViewer/TableFrame.cpp +++ b/DataViewer/TableFrame.cpp @@ -226,7 +226,7 @@ void TableFrame::DisplayPopupMenu( wxGridEvent& ev ) popup_col = ev.GetCol(); // Set Group item - vector sel_cols; + std::vector sel_cols; table_base->GetSelectedCols(sel_cols); bool any_sel_time_variant = false; for (int i=0; iGetTableInt(); @@ -437,8 +436,8 @@ void TableFrame::OnLabelLeftClickEvent( wxGridEvent& ev ) // shift down. For columns, we need to work with displayed // order. So, need to get a translation from displayed col to col // and col to displayed col. - vector col_to_dispc(cols); - vector dispc_to_col(cols); + std::vector col_to_dispc(cols); + std::vector dispc_to_col(cols); for (int i=0; iGetColPos(i); for (int i=0; iGetColAt(i); bool sel_found = false; @@ -574,11 +573,10 @@ class cid_to_pos_pair void TableFrame::OnGroupVariables( wxCommandEvent& event) { - using namespace std; TableInterface* ti = table_base->GetTableInt(); - vector sel_cols; + std::vector sel_cols; table_base->GetSelectedCols(sel_cols); - vector cid_to_disp(sel_cols.size()); + std::vector cid_to_disp(sel_cols.size()); for (int i=0; i names(sel_cols.size()); + std::vector names(sel_cols.size()); for (int i=0; iGetColName(sel_cols[i]); wxString grp_nm = ti->SuggestGroupName(names); if (sel_cols.size() > 0) { diff --git a/DataViewer/VarOrderMapper.cpp b/DataViewer/VarOrderMapper.cpp index 0e5e82352..30b6418d2 100644 --- a/DataViewer/VarOrderMapper.cpp +++ b/DataViewer/VarOrderMapper.cpp @@ -257,8 +257,7 @@ void VarOrderMapper::Group(const std::vector& col_ids, TableDeltaList_type& tdl, bool case_sensitive) { - using namespace std; - vector cols; + std::vector cols; BOOST_FOREACH(int cid, col_ids) cols.push_back(GetGroupName(cid)); // cols[i] with empty or not found names are assumed to refer to // placeholder var_grps. @@ -292,7 +291,6 @@ void VarOrderMapper::Group(const std::vector& col_ids, void VarOrderMapper::Ungroup(int grp_pos, TableDeltaList_type& tdl, bool case_sensitive) { - using namespace std; VarGroup e = FindVarGroup(grp_pos); if (e.IsSimple()) return; wxString grp_name = e.name; @@ -398,7 +396,6 @@ void VarOrderMapper::RenameTime(int time, const wxString& new_time_id) wxString VarOrderMapper::VarOrderToStr() const { - using namespace std; wxString ss; int col = 0; ss << "VarGroups_container:\n"; diff --git a/DataViewer/VarOrderPtree.cpp b/DataViewer/VarOrderPtree.cpp index f8097aa68..5f7974f0c 100644 --- a/DataViewer/VarOrderPtree.cpp +++ b/DataViewer/VarOrderPtree.cpp @@ -27,8 +27,6 @@ #include "VarOrderPtree.h" #include "VarOrderPtree.h" -using namespace std; - VarOrderPtree::VarOrderPtree() : time_ids(1, "time 0") { } @@ -59,7 +57,7 @@ void VarOrderPtree::ReadPtree(const boost::property_tree::ptree& pt, { LOG_MSG("Entering VarOrderPtree::ReadPtree"); using boost::property_tree::ptree; - set grp_set; + std::set grp_set; try { try { pt.get_child("variable_order"); @@ -234,14 +232,14 @@ bool VarOrderPtree::CorrectVarGroups(const std::vector& ds_var_list, LOG_MSG("Entering VarOrderPtree::CorrectVarGroups"); bool changed = false; - set ds_var_set; + std::set ds_var_set; BOOST_FOREACH(const wxString &v, ds_var_list) { if (case_sensitive) ds_var_set.insert(v); else ds_var_set.insert(v.Lower()); } - set var_set; - set group_nm_set; + std::set var_set; + std::set group_nm_set; BOOST_FOREACH(const VarGroup& e, var_grps) { if (e.vars.size() == 0) { if (case_sensitive) var_set.insert(e.name); @@ -268,7 +266,7 @@ bool VarOrderPtree::CorrectVarGroups(const std::vector& ds_var_list, // Ensure all vars in each group have compatible types. If not // compatible, ungroup and append to end. - list ungroup; + std::list ungroup; for (VarGroup_container::iterator i=var_grps.begin(); i!=var_grps.end();) { if (!IsTypeCompatible(i->vars, ds_var_list, ds_var_type)) { BOOST_FOREACH(const wxString& v, i->vars) { @@ -320,7 +318,7 @@ void VarOrderPtree::ReInitFromTableInt(TableInterface* table) var_grps.clear(); time_ids.clear(); - vector tm_strs; + std::vector tm_strs; table->GetTimeStrings(tm_strs); int times = table->GetTimeSteps(); int cols = table->GetNumberCols(); @@ -328,7 +326,7 @@ void VarOrderPtree::ReInitFromTableInt(TableInterface* table) for (int t=0; ttime_ids[t] = tm_strs[t].ToStdString(); } - vector col_map; + std::vector col_map; table->FillColIdMap(col_map); for (int i=0; i& vars, const std::vector& ds_var_type) { if (vars.size() == 0) return true; - set type_set; + std::set type_set; BOOST_FOREACH(const wxString& v, vars) { if (!v.empty()) { diff --git a/DefaultVarsPtree.cpp b/DefaultVarsPtree.cpp index 98f5687ae..99c2e54c6 100644 --- a/DefaultVarsPtree.cpp +++ b/DefaultVarsPtree.cpp @@ -65,7 +65,6 @@ void DefaultVarsPtree::ReadPtree(const boost::property_tree::ptree& pt, { LOG_MSG("Entering DefaultVarsPtree::ReadPtree"); using boost::property_tree::ptree; - using namespace std; default_vars_list.clear(); try { try { @@ -112,7 +111,6 @@ void DefaultVarsPtree::WritePtree(boost::property_tree::ptree& pt, const wxString& proj_path) { using boost::property_tree::ptree; - using namespace std; try { ptree& sub = pt.put("default_vars", ""); @@ -147,7 +145,6 @@ void DefaultVarsPtree::SetDefaultVarList(const std::vector& names, wxString DefaultVarsPtree::ToStr() const { - using namespace std; wxString s; BOOST_FOREACH(const DefaultVar& w, default_vars_list) s << w.ToStr(); return s; diff --git a/DialogTools/AZPDlg.cpp b/DialogTools/AZPDlg.cpp index 63433c031..5c36e4cb2 100644 --- a/DialogTools/AZPDlg.cpp +++ b/DialogTools/AZPDlg.cpp @@ -723,7 +723,7 @@ void AZPDlg::OnOK(wxCommandEvent& event ) final_of = azp->GetFinalObjectiveFunction(); delete azp; - vector > cluster_ids; + std::vector > cluster_ids; std::map > solution; for (int i=0; i clusters(rows, 0); - vector clusters_undef(rows, false); + std::vector clusters(rows, 0); + std::vector clusters_undef(rows, false); // sort result std::sort(cluster_ids.begin(), cluster_ids.end(), GenUtils::less_vectors); diff --git a/DialogTools/AbstractClusterDlg.cpp b/DialogTools/AbstractClusterDlg.cpp index e94d9a49c..b31ffc38d 100644 --- a/DialogTools/AbstractClusterDlg.cpp +++ b/DialogTools/AbstractClusterDlg.cpp @@ -1370,7 +1370,7 @@ wxString AbstractClusterDlg::_printMeanCenters(const std::vector& within_ss wxString ss_str = header; - stringstream ss; + std::stringstream ss; TextTable t( TextTable::MD ); // first row @@ -1445,7 +1445,7 @@ wxString AbstractClusterDlg::_printWithinSS(const std::vector& within_ss } //t.setAlignment( 4, TextTable::Alignment::RIGHT ); - stringstream ss1; + std::stringstream ss1; ss1 << t; summary << ss1.str(); summary << "\n"; @@ -1469,7 +1469,7 @@ wxString AbstractClusterDlg::_printWithinSS(const std::vector& within_ss wxString ss_str = header1; wxString ss_str2 = header2; - stringstream ss; + std::stringstream ss; TextTable t( TextTable::MD ); // first row @@ -1497,7 +1497,7 @@ wxString AbstractClusterDlg::_printWithinSS(const std::vector& within_ss } //t.setAlignment( 4, TextTable::Alignment::RIGHT ); - stringstream ss1; + std::stringstream ss1; ss1 << t; summary << ss1.str(); summary << "\n"; diff --git a/DialogTools/AggregateDlg.cpp b/DialogTools/AggregateDlg.cpp index d0babc6f3..9bee8b59f 100644 --- a/DialogTools/AggregateDlg.cpp +++ b/DialogTools/AggregateDlg.cpp @@ -54,8 +54,6 @@ BEGIN_EVENT_TABLE( AggregationDlg, wxDialog ) EVT_CLOSE( AggregationDlg::OnClose ) END_EVENT_TABLE() -using namespace std; - AggregationDlg::AggregationDlg(wxWindow* parent, Project* _project_s, const wxPoint& pos) : project_s(_project_s), export_dlg(NULL) { @@ -221,8 +219,8 @@ void AggregationDlg::OnExclListDClick( wxCommandEvent& ev) OnIncOneClick(ev); } -bool AggregationDlg::CheckKeys(wxString key_name, vector& key_vec, - map >& key_map) +bool AggregationDlg::CheckKeys(wxString key_name, std::vector& key_vec, + std::map >& key_map) { std::map > dup_dict; // value:[] std::vector uniq_fnames; @@ -351,7 +349,7 @@ void AggregationDlg::OnOKClick( wxCommandEvent& ev ) ev.Skip(); } -double AggregationDlg::ComputeAgg(vector& vals, vector& undefs, vector& ids) +double AggregationDlg::ComputeAgg(std::vector& vals, std::vector& undefs, std::vector& ids) { if (m_sum->GetValue()) { double v_sum = 0; @@ -402,7 +400,7 @@ double AggregationDlg::ComputeAgg(vector& vals, vector& undefs, ve } OGRColumn* AggregationDlg::CreateNewOGRColumn(int new_rows, int col_id, int tm_id, - std::map >& key_map) + std::map >& key_map) { int f_length = table_int->GetColLength(col_id, tm_id); int f_decimal = table_int->GetColDecimals(col_id, tm_id); @@ -443,7 +441,7 @@ OGRColumn* AggregationDlg::CreateNewOGRColumn(int new_rows, int col_id, int tm_i cnt = 0; table_int->GetColData(col_id, tm_id, vals, undefs); for (it = key_map.begin(); it != key_map.end(); ++it) { - vector& ids = it->second; + std::vector& ids = it->second; double v = ComputeAgg(vals, undefs, ids); _col->SetValueAt(cnt, v); cnt += 1; diff --git a/DialogTools/AggregateDlg.h b/DialogTools/AggregateDlg.h index 47f85b84d..619052186 100644 --- a/DialogTools/AggregateDlg.h +++ b/DialogTools/AggregateDlg.h @@ -116,12 +116,12 @@ class AggregationDlg: public wxDialog, public FramesManagerObserver //std::vector col_id_map; bool CheckKeys(wxString key_name, std::vector& key_vec, - std::map >& key_map); + std::map >& key_map); OGRColumn* CreateNewOGRColumn(int new_rows, int col_id, int tm_id, - std::map >& key_map); + std::map >& key_map); - double ComputeAgg(vector& vals, vector& undefs, vector& ids); + double ComputeAgg(std::vector& vals, std::vector& undefs, std::vector& ids); DECLARE_EVENT_TABLE() }; diff --git a/DialogTools/AutoUpdateDlg.cpp b/DialogTools/AutoUpdateDlg.cpp index c5eb4ed80..78e883501 100644 --- a/DialogTools/AutoUpdateDlg.cpp +++ b/DialogTools/AutoUpdateDlg.cpp @@ -55,10 +55,8 @@ #include "../ShapeOperations/OGRDataAdapter.h" #include "AutoUpdateDlg.h" -using namespace std; - size_t write_to_string(void *ptr, size_t size, size_t count, void *stream) { - ((string*)stream)->append((char*)ptr, 0, size*count); + ((std::string*)stream)->append((char*)ptr, 0, size*count); return size*count; } @@ -75,10 +73,10 @@ size_t write_to_file(void *ptr, size_t size, size_t nmemb, void* userdata) return written; } -string ReadUrlContent(const char* url) +std::string ReadUrlContent(const char* url) { wxLogMessage("AutoUpdate::ReadUrlContent()"); - string response; + std::string response; CURL* curl = curl_easy_init(); CURLcode res; diff --git a/DialogTools/Bnd2ShpDlg.cpp b/DialogTools/Bnd2ShpDlg.cpp index dcc645c18..b8304a21a 100644 --- a/DialogTools/Bnd2ShpDlg.cpp +++ b/DialogTools/Bnd2ShpDlg.cpp @@ -76,9 +76,9 @@ void Bnd2ShpDlg::OnCreateClick( wxCommandEvent& event ) wxString m_iASC = m_inputfile->GetValue(); #ifdef __WIN32__ - std:ifstream ias(m_iASC.wc_str()); + std::ifstream ias(m_iASC.wc_str()); #else - std:ifstream ias; + std::ifstream ias; ias.open(GET_ENCODED_FILENAME(m_iASC)); #endif @@ -113,8 +113,8 @@ void Bnd2ShpDlg::OnCreateClick( wxCommandEvent& event ) } int nPoint, ID; - vector IDs; - vector polys; + std::vector IDs; + std::vector polys; for (long row = nRows; row >= 1; row--) { diff --git a/DialogTools/CalculatorDlg.cpp b/DialogTools/CalculatorDlg.cpp index f6a9eaf0b..7d7521c31 100644 --- a/DialogTools/CalculatorDlg.cpp +++ b/DialogTools/CalculatorDlg.cpp @@ -563,7 +563,7 @@ void CalculatorDlg::AssignOrSelect(bool assign) } } int num_obs_sel = 0; - vector selected(obs); + std::vector selected(obs); if (V_obs == 1) { bool val = V[t]!=0 ? true : false; for (size_t i=0; iGetId() == XRCID("ID_CAT_BUT")) { - cat_color_button_srt_vec.push_back(make_pair((*it)->GetPosition().y, (*it))); + cat_color_button_srt_vec.push_back(std::make_pair((*it)->GetPosition().y, (*it))); } else if ((*it)->GetId() == XRCID("ID_CAT_TXT")) { - cat_title_txt_srt_vec.push_back(make_pair((*it)->GetPosition().y, (*it))); + cat_title_txt_srt_vec.push_back(std::make_pair((*it)->GetPosition().y, (*it))); } else if ((*it)->GetId() == XRCID("ID_BRK_RAD")) { - brk_rad_srt_vec.push_back(make_pair((*it)->GetPosition().y, (*it))); + brk_rad_srt_vec.push_back(std::make_pair((*it)->GetPosition().y, (*it))); } else if ((*it)->GetId() == XRCID("ID_BRK_LBL")) { - brk_lbl_srt_vec.push_back(make_pair((*it)->GetPosition().y, (*it))); + brk_lbl_srt_vec.push_back(std::make_pair((*it)->GetPosition().y, (*it))); } else if ((*it)->GetId() == XRCID("ID_BRK_TXT")) { - brk_txt_srt_vec.push_back(make_pair((*it)->GetPosition().y, (*it))); + brk_txt_srt_vec.push_back(std::make_pair((*it)->GetPosition().y, (*it))); } } @@ -2589,7 +2587,7 @@ void CatClassifPanel::UpdateCCState() for (int i=0; iDelete(items[i]); } - vector titles; + std::vector titles; CatClassifManager* ccm = project->GetCatClassifManager(); ccm->GetTitles(titles); sm->Append(XRCID("ID_NEW_CUSTOM_CAT_CLASSIF_A"), diff --git a/DialogTools/ConnectDatasourceDlg.cpp b/DialogTools/ConnectDatasourceDlg.cpp index 20e246799..5311e21ad 100644 --- a/DialogTools/ConnectDatasourceDlg.cpp +++ b/DialogTools/ConnectDatasourceDlg.cpp @@ -55,8 +55,6 @@ #include "../rc/GeoDaIcon-16x16.xpm" #include "ConnectDatasourceDlg.h" -using namespace std; - DnDFile::DnDFile(ConnectDatasourceDlg *pOwner) { m_pOwner = pOwner; diff --git a/DialogTools/ConnectDatasourceDlg.h b/DialogTools/ConnectDatasourceDlg.h index 8747fae35..8aacb5af4 100644 --- a/DialogTools/ConnectDatasourceDlg.h +++ b/DialogTools/ConnectDatasourceDlg.h @@ -34,8 +34,6 @@ #include "DatasourceDlg.h" #include "DatasourceDlg.h" -using namespace std; - // // Class RecentDatasource // @@ -59,7 +57,7 @@ class RecentDatasource wxString GetLastLayerName(); wxString GetLastDSName(); void UpdateLastThumb(wxString ds_thumb); - vector GetList(); + std::vector GetList(); IDataSource* GetDatasource(wxString ds_name); wxString GetLayerName(wxString ds_name); @@ -69,15 +67,15 @@ class RecentDatasource wxString GetDSThumbnail(int idx) {return ds_thumbnails[idx];} protected: static const int N_MAX_ITEMS; - static const string KEY_NAME_IN_GDA_HISTORY; + static const std::string KEY_NAME_IN_GDA_HISTORY; int n_ds; wxString ds_json_str; - vector ds_names; - vector ds_layernames; - vector ds_confs; - vector ds_thumbnails; + std::vector ds_names; + std::vector ds_layernames; + std::vector ds_confs; + std::vector ds_thumbnails; void Init(wxString json_str); }; diff --git a/DialogTools/CreateGridDlg.cpp b/DialogTools/CreateGridDlg.cpp index 30b8762f0..08024854b 100644 --- a/DialogTools/CreateGridDlg.cpp +++ b/DialogTools/CreateGridDlg.cpp @@ -198,7 +198,7 @@ void CreateGridDlg::OnCReferencefileClick( wxCommandEvent& event ) if (pos >= 0) fn = fn.Left(pos); - ifstream ifl(GET_ENCODED_FILENAME(m_path), ios::in); + std::ifstream ifl(GET_ENCODED_FILENAME(m_path), std::ios::in); if (ifl.fail()) { wxMessageBox(_("File doesn't exist!")); return; @@ -425,7 +425,7 @@ bool CreateGridDlg::CreateGrid() y[m_nRows] = m_yTop; for (i = 1;i < m_nRows; i++) y[i] = y[i-1] + d_y; - vector grids; + std::vector grids; int n_pts = 5; int n_polygons = m_nRows * m_nCols; diff --git a/DialogTools/CsvFieldConfDlg.cpp b/DialogTools/CsvFieldConfDlg.cpp index 86a6c71e4..31d1aea5a 100644 --- a/DialogTools/CsvFieldConfDlg.cpp +++ b/DialogTools/CsvFieldConfDlg.cpp @@ -55,9 +55,6 @@ #include "LocaleSetupDlg.h" #include "CsvFieldConfDlg.h" -using namespace std; - - CsvFieldConfDlg::CsvFieldConfDlg(wxWindow* parent, wxString _filepath, wxCSConv* encoding, diff --git a/DialogTools/DBScanDlg.cpp b/DialogTools/DBScanDlg.cpp index bcf5c7ca7..182e3d5fa 100644 --- a/DialogTools/DBScanDlg.cpp +++ b/DialogTools/DBScanDlg.cpp @@ -81,7 +81,7 @@ DBScanDlg::~DBScanDlg() void DBScanDlg::Highlight(int id) { - vector& hs = highlight_state->GetHighlight(); + std::vector& hs = highlight_state->GetHighlight(); for (int i=0; inotifyObservers(this); } -void DBScanDlg::Highlight(vector& ids) +void DBScanDlg::Highlight(std::vector& ids) { - vector& hs = highlight_state->GetHighlight(); + std::vector& hs = highlight_state->GetHighlight(); for (int i=0; i& cluste cluster_ids = cluster_groups; } -bool DBScanDlg::Run(vector& clusters) +bool DBScanDlg::Run(std::vector& clusters) { cluster_ids.clear(); clusters.clear(); @@ -667,7 +667,7 @@ void DBScanDlg::OnOKClick(wxCommandEvent& event ) } } -void DBScanDlg::GetClusterFromDendrogram(vector& clusters) +void DBScanDlg::GetClusterFromDendrogram(std::vector& clusters) { cluster_ids.clear(); clusters.clear(); @@ -737,7 +737,7 @@ void DBScanDlg::OnSaveClick(wxCommandEvent& event ) } if (col > 0) { - vector clusters_undef(rows, false); + std::vector clusters_undef(rows, false); table_int->SetColData(col, time, clusters); table_int->SetColUndefined(col, time, clusters_undef); } diff --git a/DialogTools/DBScanDlg.h b/DialogTools/DBScanDlg.h index 143b4b1f0..d3dce08d7 100644 --- a/DialogTools/DBScanDlg.h +++ b/DialogTools/DBScanDlg.h @@ -67,13 +67,13 @@ class DBScanDlg : public AbstractClusterDlg, public HighlightStateObserver void UpdateClusterChoice(int n, std::vector& clusters); void Highlight(int id); - void Highlight(vector& ids); + void Highlight(std::vector& ids); protected: - virtual bool Run(vector& clusters); + virtual bool Run(std::vector& clusters); virtual bool RunStar(); virtual bool CheckAllInputs(); - virtual void GetClusterFromDendrogram(vector& clusters); + virtual void GetClusterFromDendrogram(std::vector& clusters); protected: char dist; @@ -81,10 +81,10 @@ class DBScanDlg : public AbstractClusterDlg, public HighlightStateObserver int m_min_pts; double eps; - vector > cluster_ids; + std::vector > cluster_ids; double cutoffDistance; - vector clusters; + std::vector clusters; wxChoice* combo_n; wxChoice* combo_cov; diff --git a/DialogTools/DatasourceDlg.cpp b/DialogTools/DatasourceDlg.cpp index a56f5b4a1..8f72aedb2 100644 --- a/DialogTools/DatasourceDlg.cpp +++ b/DialogTools/DatasourceDlg.cpp @@ -46,8 +46,6 @@ #include "../GdaJson.h" #include "DatasourceDlg.h" -using namespace std; - void DatasourceDlg::Init() { m_ds_menu = NULL; @@ -116,13 +114,13 @@ void DatasourceDlg::CreateControls() m_database_type->SetSelection(0); // for autocompletion of input boxes in Database Tab - vector host_cands = + std::vector host_cands = OGRDataAdapter::GetInstance().GetHistory("db_host"); - vector port_cands = + std::vector port_cands = OGRDataAdapter::GetInstance().GetHistory("db_port"); - vector uname_cands = + std::vector uname_cands = OGRDataAdapter::GetInstance().GetHistory("db_user"); - vector name_cands = + std::vector name_cands = OGRDataAdapter::GetInstance().GetHistory("db_name"); m_database_host->SetAutoList(host_cands); @@ -131,14 +129,14 @@ void DatasourceDlg::CreateControls() m_database_name->SetAutoList(name_cands); // get a latest input DB information - vector db_infos = OGRDataAdapter::GetInstance().GetHistory("db_info"); + std::vector db_infos = OGRDataAdapter::GetInstance().GetHistory("db_info"); if (db_infos.size() > 0) { wxString db_info = db_infos[0]; json_spirit::Value v; // try to parse as JSON try { if (!json_spirit::read(db_info.ToStdString(), v)) { - throw runtime_error("Could not parse title as JSON"); + throw std::runtime_error("Could not parse title as JSON"); } json_spirit::Value json_db_type; if (GdaJson::findValue(v, json_db_type, "db_type")) { @@ -215,7 +213,7 @@ void DatasourceDlg::PromptDSLayers(IDataSource* datasource) throw GdaException(msg.mb_str()); } - vector table_names; + std::vector table_names; ds_type = OGRDataAdapter::GetInstance().GetLayerNames(ds_name, ds_type, table_names); datasource->UpdateDataSource(ds_type); diff --git a/DialogTools/DissolveDlg.cpp b/DialogTools/DissolveDlg.cpp index c882b8b5a..95c51ceaf 100644 --- a/DialogTools/DissolveDlg.cpp +++ b/DialogTools/DissolveDlg.cpp @@ -54,8 +54,6 @@ BEGIN_EVENT_TABLE( DissolveDlg, wxDialog ) EVT_CLOSE( DissolveDlg::OnClose ) END_EVENT_TABLE() -using namespace std; - DissolveDlg::DissolveDlg(wxWindow* parent, Project* _project_s, const wxPoint& pos) : project_s(_project_s), export_dlg(NULL) { @@ -220,7 +218,7 @@ void DissolveDlg::OnExclListDClick( wxCommandEvent& ev) } bool DissolveDlg::CheckKeys(wxString key_name, std::vector& key_vec, - std::map >& key_map) + std::map >& key_map) { std::map > dup_dict; // value:[] std::vector uniq_fnames; @@ -360,8 +358,8 @@ void DissolveDlg::OnOKClick( wxCommandEvent& ev ) ev.Skip(); } -double DissolveDlg::ComputeAgg(vector& vals, vector& undefs, - vector& ids) +double DissolveDlg::ComputeAgg(std::vector& vals, std::vector& undefs, + std::vector& ids) { if (m_sum->GetValue()) { double v_sum = 0; @@ -412,7 +410,7 @@ double DissolveDlg::ComputeAgg(vector& vals, vector& undefs, } OGRColumn* DissolveDlg::CreateNewOGRColumn(int new_rows, int col_id, int tm_id, - std::map >& key_map) + std::map >& key_map) { int f_length = table_int->GetColLength(col_id, tm_id); int f_decimal = table_int->GetColDecimals(col_id, tm_id); @@ -453,7 +451,7 @@ OGRColumn* DissolveDlg::CreateNewOGRColumn(int new_rows, int col_id, int tm_id, cnt = 0; table_int->GetColData(col_id, tm_id, vals, undefs); for (it = key_map.begin(); it != key_map.end(); ++it) { - vector& ids = it->second; + std::vector& ids = it->second; double v = ComputeAgg(vals, undefs, ids); _col->SetValueAt(cnt, v); cnt += 1; diff --git a/DialogTools/DissolveDlg.h b/DialogTools/DissolveDlg.h index ce7d13e76..cc2643289 100644 --- a/DialogTools/DissolveDlg.h +++ b/DialogTools/DissolveDlg.h @@ -106,12 +106,12 @@ class DissolveDlg: public wxDialog, public FramesManagerObserver //std::vector col_id_map; bool CheckKeys(wxString key_name, std::vector& key_vec, - std::map >& key_map); + std::map >& key_map); OGRColumn* CreateNewOGRColumn(int new_rows, int col_id, int tm_id, - std::map >& key_map); + std::map >& key_map); - double ComputeAgg(vector& vals, vector& undefs, vector& ids); + double ComputeAgg(std::vector& vals, std::vector& undefs, std::vector& ids); DECLARE_EVENT_TABLE() }; diff --git a/DialogTools/ExportCsvDlg.cpp b/DialogTools/ExportCsvDlg.cpp index 6d5dfe318..d66eae44d 100644 --- a/DialogTools/ExportCsvDlg.cpp +++ b/DialogTools/ExportCsvDlg.cpp @@ -65,7 +65,6 @@ void ExportCsvDlg::CreateControls() void ExportCsvDlg::OnOkClick( wxCommandEvent& event ) { wxLogMessage("In ExportCsvDlg::OnOkClick()"); - using namespace std; if (!all_init) return; bool inc_var_names = (include_var_names_cb->GetValue() == 1); @@ -120,14 +119,14 @@ void ExportCsvDlg::OnOkClick( wxCommandEvent& event ) return; } - vector col_map; + std::vector col_map; table_int->FillColIdMap(col_map); int tot_cols = 0; int rows = table_int->GetNumberRows(); int cols = table_int->GetNumberCols(); - vector v; + std::vector v; // This will export with the group name and time period rather @@ -138,7 +137,7 @@ void ExportCsvDlg::OnOkClick( wxCommandEvent& event ) for (int t=0; tGetColTimeSteps(cid); t++) { if (table_int->GetColType(cid, t) == GdaConst::placeholder_type) continue; - ostringstream ss; + std::ostringstream ss; ss << table_int->GetColName(cid).ToStdString(); if (table_int->GetColTimeSteps(cid) > 1) { ss << "_" << project->GetTableInt()->GetTimeString(t); @@ -147,7 +146,7 @@ void ExportCsvDlg::OnOkClick( wxCommandEvent& event ) ++tot_cols; } } - string record; + std::string record; Gda::StringsToCsvRecord(v, record); out_file << record << "\n"; } @@ -162,7 +161,7 @@ void ExportCsvDlg::OnOkClick( wxCommandEvent& event ) v[v_ind++] = table_int->GetCellString(row,col,t).ToStdString(); } } - string record; + std::string record; Gda::StringsToCsvRecord(v, record); out_file << record << "\n"; } diff --git a/DialogTools/ExportDataDlg.cpp b/DialogTools/ExportDataDlg.cpp index 20565a8b5..84957bb63 100644 --- a/DialogTools/ExportDataDlg.cpp +++ b/DialogTools/ExportDataDlg.cpp @@ -51,8 +51,6 @@ #include "ConnectDatasourceDlg.h" #include "ExportDataDlg.h" -using namespace std; - BEGIN_EVENT_TABLE( ExportDataDlg, wxDialog ) EVT_BUTTON( XRCID("IDC_OPEN_IASC"), ExportDataDlg::OnBrowseDSfileBtn ) EVT_BUTTON( wxID_OK, ExportDataDlg::OnOkClick ) @@ -83,7 +81,7 @@ spatial_ref(NULL) } ExportDataDlg::ExportDataDlg(wxWindow* parent, - vector& _geometries, + std::vector& _geometries, Shapefile::ShapeType _shape_type, Project* _project, bool isSelectedOnly, @@ -117,7 +115,7 @@ ExportDataDlg::ExportDataDlg(wxWindow* parent, // Export POINT data only, e.g. centroids/mean centers ExportDataDlg::ExportDataDlg(wxWindow* parent, - vector& _geometries, + std::vector& _geometries, Shapefile::ShapeType _shape_type, wxString _point_name, Project* _project, @@ -389,8 +387,8 @@ void ExportDataDlg::OnOkClick( wxCommandEvent& event ) if (col_y == wxNOT_FOUND) col_y = table_p->InsertCol(GdaConst::double_type, y_field_name); - vector x_data; - vector y_data; + std::vector x_data; + std::vector y_data; for(size_t i=0; iGetX()); y_data.push_back(((GdaPoint*)(geometries[i]))->GetY()); @@ -526,18 +524,18 @@ ExportDataDlg::CreateOGRLayer(wxString& ds_name, bool is_table, { // The reason that we don't use Project::Main directly is for creating // datasource from centroids/centers directly, we have to use - // vector. Therefore, we use it as a uniform interface. + // std::vector. Therefore, we use it as a uniform interface. // for shp/dbf reading, we need to convert Main data to GdaShape first // this will spend some time, but keep the rest of code clean. // Note: potential speed/memory performance issue - vector selected_rows; + std::vector selected_rows; if ( project_p != NULL && geometries.empty() && !is_save_centroids ) { shape_type = Shapefile::NULL_SHAPE; int num_obs = project_p->main_data.records.size(); if (num_obs == 0) num_obs = project_p->GetNumRecords(); if (num_obs == 0) { - ostringstream msg; + std::ostringstream msg; msg << _("Saving failed: GeoDa can't save as empty datasource."); throw GdaException(msg.str().c_str()); } @@ -586,7 +584,7 @@ ExportDataDlg::CreateOGRLayer(wxString& ds_name, bool is_table, // convert to OGR geometries, reproject if needed OGRDataAdapter& ogr_adapter = OGRDataAdapter::GetInstance(); - vector ogr_geometries; + std::vector ogr_geometries; OGRwkbGeometryType geom_type = wkbNone; OGRSpatialReference new_ref; if (is_table) { diff --git a/DialogTools/ExportDataDlg.h b/DialogTools/ExportDataDlg.h index bc04fff82..3b8512fec 100644 --- a/DialogTools/ExportDataDlg.h +++ b/DialogTools/ExportDataDlg.h @@ -96,7 +96,7 @@ class ExportDataDlg: public DatasourceDlg wxTextCtrl* m_crs_input; Project* project_p; TableInterface* table_p; - vector geometries; + std::vector geometries; Shapefile::ShapeType shape_type; OGRSpatialReference* spatial_ref; @@ -108,7 +108,7 @@ class ExportDataDlg: public DatasourceDlg bool is_selected_only; bool is_create_project; bool is_saveas_op; - // e.g. centroids, grids. vector geometries + // e.g. centroids, grids. std::vector geometries // take ownership of external geometries temporarily, // so its memory will be maintained (no cleanup). bool is_geometry_only; diff --git a/DialogTools/FieldNameCorrectionDlg.cpp b/DialogTools/FieldNameCorrectionDlg.cpp index 233f6e54a..119fd0aba 100644 --- a/DialogTools/FieldNameCorrectionDlg.cpp +++ b/DialogTools/FieldNameCorrectionDlg.cpp @@ -41,16 +41,16 @@ END_EVENT_TABLE() ScrolledWidgetsPane::ScrolledWidgetsPane(wxWindow* parent, wxWindowID id, GdaConst::DataSourceType ds_type, - vector& all_fname) + std::vector& all_fname) : wxScrolledWindow(parent, id, wxDefaultPosition, wxSize(700,300)), ds_type(ds_type), need_correction(false) { //is_case_sensitive = OGRLayerProxy::IsFieldCaseSensitive(ds_type); is_case_sensitive = false; - vector merged_field_names; - set bad_fnames, dup_fname, uniq_upper_fname; - set::iterator uniq_iter; - vector bad_fname_idx_s, dup_fname_idx_s; + std::vector merged_field_names; + std::set bad_fnames, dup_fname, uniq_upper_fname; + std::set::iterator uniq_iter; + std::vector bad_fname_idx_s, dup_fname_idx_s; for (int i=0; i < all_fname.size(); i++) { wxString field_name = all_fname[i]; @@ -97,10 +97,10 @@ ds_type(ds_type), need_correction(false) ScrolledWidgetsPane::ScrolledWidgetsPane(wxWindow* parent, wxWindowID id, GdaConst::DataSourceType ds_type, std::set table_fnames, - map& fnames_dict, - vector& merged_field_names, - set& dup_fname, - set& bad_fname) + std::map& fnames_dict, + std::vector& merged_field_names, + std::set& dup_fname, + std::set& bad_fname) : wxScrolledWindow(parent, id, wxDefaultPosition, wxSize(700,300)), field_names_dict(fnames_dict), ds_type(ds_type), @@ -123,8 +123,8 @@ ScrolledWidgetsPane::~ScrolledWidgetsPane() } } -void ScrolledWidgetsPane::Init(vector& dup_fname_idx_s, - vector& bad_fname_idx_s) +void ScrolledWidgetsPane::Init(std::vector& dup_fname_idx_s, + std::vector& bad_fname_idx_s) { // the sizer will take care of determining the needed scroll size // (if you don't use sizers you will need to manually set the viewport size) @@ -251,16 +251,16 @@ void ScrolledWidgetsPane::Init(vector& dup_fname_idx_s, Centre(); } -void ScrolledWidgetsPane::Init(vector& merged_field_names, - set& dup_fname, - set& bad_fname) +void ScrolledWidgetsPane::Init(std::vector& merged_field_names, + std::set& dup_fname, + std::set& bad_fname) { // the sizer will take care of determining the needed scroll size // (if you don't use sizers you will need to manually set the viewport size) // build a dict for searching duplicated field - map::iterator iter; + std::map::iterator iter; // update changed fields for (iter = field_names_dict.begin(); iter != field_names_dict.end(); ++iter ) @@ -301,7 +301,7 @@ void ScrolledWidgetsPane::Init(vector& merged_field_names, size_t ctrl_cnt = 0; - for (set::iterator it=dup_fname.begin(); + for (std::set::iterator it=dup_fname.begin(); it != dup_fname.end(); ++it ) { wxString field_name = *it; warn_msg=DUP_WARN; @@ -330,7 +330,7 @@ void ScrolledWidgetsPane::Init(vector& merged_field_names, ++ctrl_cnt; } - for (set::iterator it=bad_fname.begin(); + for (std::set::iterator it=bad_fname.begin(); it != bad_fname.end(); ++it ) { wxString field_name = *it; warn_msg=INV_WARN; @@ -559,7 +559,7 @@ bool ScrolledWidgetsPane::CheckUserInput() wxString str_invalid_field = _("Input is not valid."); // reset - map current_inputs; + std::map current_inputs; for ( size_t i=0, sz=txt_input.size(); iSetForegroundColour(*wxBLACK); @@ -617,12 +617,12 @@ bool ScrolledWidgetsPane::CheckUserInput() } -map ScrolledWidgetsPane::GetMergedFieldNameDict() +std::map ScrolledWidgetsPane::GetMergedFieldNameDict() { return field_names_dict; } -vector ScrolledWidgetsPane::GetNewFieldNames() +std::vector ScrolledWidgetsPane::GetNewFieldNames() { return new_field_names; } @@ -635,7 +635,7 @@ vector ScrolledWidgetsPane::GetNewFieldNames() FieldNameCorrectionDlg:: FieldNameCorrectionDlg(GdaConst::DataSourceType ds_type, - vector& all_fname, + std::vector& all_fname, wxString title) : wxDialog(NULL, wxID_ANY, title, wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) @@ -674,10 +674,10 @@ FieldNameCorrectionDlg(GdaConst::DataSourceType ds_type, FieldNameCorrectionDlg:: FieldNameCorrectionDlg(GdaConst::DataSourceType ds_type, std::set table_fnames, - map& fnames_dict, - vector& merged_field_names, - set& dup_fname, - set& bad_fname, + std::map& fnames_dict, + std::vector& merged_field_names, + std::set& dup_fname, + std::set& bad_fname, wxString title) : wxDialog(NULL, wxID_ANY, title, wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER) diff --git a/DialogTools/FieldNameCorrectionDlg.h b/DialogTools/FieldNameCorrectionDlg.h index 378db78ea..c5a2e0437 100644 --- a/DialogTools/FieldNameCorrectionDlg.h +++ b/DialogTools/FieldNameCorrectionDlg.h @@ -28,8 +28,6 @@ #include #include "../DataViewer/TableInterface.h" -using namespace std; - class ScrolledWidgetsPane : public wxScrolledWindow { private: @@ -37,14 +35,14 @@ class ScrolledWidgetsPane : public wxScrolledWindow GdaConst::DataSourceType ds_type; bool is_case_sensitive; // old_name : new_name (after correction) - map field_names_dict; - map field_dict; - vector merged_field_names; + std::map field_names_dict; + std::map field_dict; + std::vector merged_field_names; - map user_input_dict; + std::map user_input_dict; - vector old_field_names; - vector new_field_names; + std::vector old_field_names; + std::vector new_field_names; std::set table_fnames; public: @@ -64,14 +62,14 @@ class ScrolledWidgetsPane : public wxScrolledWindow ScrolledWidgetsPane(wxWindow* parent, wxWindowID id, GdaConst::DataSourceType ds_type, - vector& all_fname); + std::vector& all_fname); ScrolledWidgetsPane(wxWindow* parent, wxWindowID id, GdaConst::DataSourceType ds_type, std::set table_fnames, - map& fnames_dict, - vector& merged_field_names, - set& dup_fname, - set& bad_fname); + std::map& fnames_dict, + std::vector& merged_field_names, + std::set& dup_fname, + std::set& bad_fname); virtual ~ScrolledWidgetsPane(); void OnUserInput(wxCommandEvent& ev); @@ -82,14 +80,14 @@ class ScrolledWidgetsPane : public wxScrolledWindow wxString TruncateFieldName(const wxString& old_name, int max_len=0); bool IsFieldNameValid(const wxString& col_name); - map GetMergedFieldNameDict(); - vector GetNewFieldNames(); + std::map GetMergedFieldNameDict(); + std::vector GetNewFieldNames(); - void Init(vector& merged_field_names, - set& dup_fname, - set& bad_fname); + void Init(std::vector& merged_field_names, + std::set& dup_fname, + std::set& bad_fname); - void Init(vector& dup_fname_idx_s, vector& bad_fname_idx_s); + void Init(std::vector& dup_fname_idx_s, std::vector& bad_fname_idx_s); bool CheckUserInput(); @@ -103,25 +101,25 @@ class FieldNameCorrectionDlg: public wxDialog public: FieldNameCorrectionDlg(GdaConst::DataSourceType ds_type, - vector& all_fname, + std::vector& all_fname, wxString title="Update Field Name"); FieldNameCorrectionDlg(GdaConst::DataSourceType ds_type, std::set table_fnames, - map& fnames_dict, - vector& merged_field_names, - set& dup_fname, - set& bad_fname, + std::map& fnames_dict, + std::vector& merged_field_names, + std::set& dup_fname, + std::set& bad_fname, wxString title="Update Field Name"); virtual ~FieldNameCorrectionDlg(); bool NeedCorrection() { return need_correction;} - map GetMergedFieldNameDict(){ + std::map GetMergedFieldNameDict(){ return fieldPane->GetMergedFieldNameDict(); } - vector GetNewFieldNames() { + std::vector GetNewFieldNames() { return fieldPane->GetNewFieldNames(); } diff --git a/DialogTools/HClusterDlg.cpp b/DialogTools/HClusterDlg.cpp index bb8599c61..2023658b5 100644 --- a/DialogTools/HClusterDlg.cpp +++ b/DialogTools/HClusterDlg.cpp @@ -94,7 +94,7 @@ HClusterDlg::~HClusterDlg() void HClusterDlg::Highlight(int id) { - vector& hs = highlight_state->GetHighlight(); + std::vector& hs = highlight_state->GetHighlight(); for (int i=0; inotifyObservers(this); } -void HClusterDlg::Highlight(vector& ids) +void HClusterDlg::Highlight(std::vector& ids) { - vector& hs = highlight_state->GetHighlight(); + std::vector& hs = highlight_state->GetHighlight(); for (int i=0; i 0) { - vector clusters_undef(rows, false); + std::vector clusters_undef(rows, false); table_int->SetColData(col, time, clusters); table_int->SetColUndefined(col, time, clusters_undef); } @@ -473,7 +473,7 @@ bool HClusterDlg::CheckAllInputs() return true; } -bool HClusterDlg::Run(vector& clusters) +bool HClusterDlg::Run(std::vector& clusters) { // NOTE input_data should be retrieved first!! // get input: weights (auto) @@ -1099,7 +1099,7 @@ int DendrogramPanel::countLevels(int node_idx, int cur_lvl) int left = countLevels(root[-node_idx-1].left, cur_lvl+1); int right = countLevels(root[-node_idx-1].right, cur_lvl+1); - int lvl = 1 + max(left, right); + int lvl = 1 + std::max(left, right); return lvl; } @@ -1150,5 +1150,5 @@ int DendrogramPanel::countLevels(GdaNode* node) return 1 + countLevels(&root[-node->left-1]); } - return 1 + max(countLevels(&root[-node->left-1]), countLevels(&root[-node->right-1])); + return 1 + std::max(countLevels(&root[-node->left-1]), countLevels(&root[-node->right-1])); } diff --git a/DialogTools/HClusterDlg.h b/DialogTools/HClusterDlg.h index 8f5ac3bf3..b33aff012 100644 --- a/DialogTools/HClusterDlg.h +++ b/DialogTools/HClusterDlg.h @@ -269,10 +269,10 @@ class HClusterDlg : public AbstractClusterDlg, public HighlightStateObserver void UpdateClusterChoice(int n, std::vector& clusters); void Highlight(int id); - void Highlight(vector& ids); + void Highlight(std::vector& ids); protected: - virtual bool Run(vector& clusters); + virtual bool Run(std::vector& clusters); virtual bool CheckAllInputs(); GdaNode* htree; @@ -281,7 +281,7 @@ class HClusterDlg : public AbstractClusterDlg, public HighlightStateObserver char method; double cutoffDistance; - vector clusters; + std::vector clusters; bool show_centroids; bool show_weights; diff --git a/DialogTools/HDBScanDlg.cpp b/DialogTools/HDBScanDlg.cpp index 78df4277b..259a5c366 100644 --- a/DialogTools/HDBScanDlg.cpp +++ b/DialogTools/HDBScanDlg.cpp @@ -79,7 +79,7 @@ HDBScanDlg::~HDBScanDlg() void HDBScanDlg::Highlight(int id) { - vector& hs = highlight_state->GetHighlight(); + std::vector& hs = highlight_state->GetHighlight(); for (int i=0; inotifyObservers(this); } -void HDBScanDlg::Highlight(vector& ids) +void HDBScanDlg::Highlight(std::vector& ids) { - vector& hs = highlight_state->GetHighlight(); + std::vector& hs = highlight_state->GetHighlight(); for (int i=0; i new_data(new_col); - vector undefs(rows, false); + std::vector undefs(rows, false); new_data[0].d_val = &core_dist; new_data[0].label = "Core Dist"; @@ -462,7 +462,7 @@ bool HDBScanDlg::CheckAllInputs() return true; } -bool HDBScanDlg::Run(vector& clusters) +bool HDBScanDlg::Run(std::vector& clusters) { cluster_ids.clear(); clusters.clear(); @@ -614,7 +614,7 @@ void HDBScanDlg::OnOKClick(wxCommandEvent& event ) } if (col > 0) { - vector clusters_undef(rows, false); + std::vector clusters_undef(rows, false); table_int->SetColData(col, time, clusters); table_int->SetColUndefined(col, time, clusters_undef); } diff --git a/DialogTools/HDBScanDlg.h b/DialogTools/HDBScanDlg.h index 497f11298..6b03a5579 100644 --- a/DialogTools/HDBScanDlg.h +++ b/DialogTools/HDBScanDlg.h @@ -1380,16 +1380,16 @@ class HDBScanDlg : public AbstractClusterDlg, public HighlightStateObserver int m_cluster_selection_method; bool m_allow_single_cluster; - vector core_dist; - vector probabilities; - vector outliers; - vector hdbscan_clusters; - vector > cluster_ids; + std::vector core_dist; + std::vector probabilities; + std::vector outliers; + std::vector hdbscan_clusters; + std::vector > cluster_ids; int max_n_clusters; double cutoffDistance; - vector clusters; + std::vector clusters; wxButton *saveButton; wxChoice* combo_n; @@ -1429,10 +1429,10 @@ class HDBScanDlg : public AbstractClusterDlg, public HighlightStateObserver void UpdateClusterChoice(int n, std::vector& clusters); void Highlight(int id); - void Highlight(vector& ids); + void Highlight(std::vector& ids); protected: - virtual bool Run(vector& clusters); + virtual bool Run(std::vector& clusters); virtual bool CheckAllInputs(); DECLARE_EVENT_TABLE() diff --git a/DialogTools/KMeansDlg.cpp b/DialogTools/KMeansDlg.cpp index 4fb55e17c..bc18d6601 100644 --- a/DialogTools/KMeansDlg.cpp +++ b/DialogTools/KMeansDlg.cpp @@ -213,14 +213,14 @@ void MakeSpatialDlg::OnSelClusterIndicator(wxCommandEvent& event) std::vector clusters(rows, 0); table_int->GetColData(col, tm, clusters); - map > cluster_dict; + std::map > cluster_dict; for (int i = 0; i < rows; ++i) { cluster_dict[clusters[i]].push_back(i); } // sort result std::vector > cluster_ids; - map >::iterator it; + std::map >::iterator it; for (it = cluster_dict.begin(); it != cluster_dict.end(); ++it) { cluster_ids.push_back(it->second); } @@ -336,16 +336,16 @@ void MakeSpatialDlg::OnOK(wxCommandEvent& event ) std::vector clusters(rows, 0); table_int->GetColData(col, tm, clusters); - vector clusters_undef(rows, false); + std::vector clusters_undef(rows, false); - map > cluster_dict; + std::map > cluster_dict; for (int i = 0; i < rows; ++i) { cluster_dict[clusters[i]].push_back(i); } // sort result std::vector > cluster_ids; - map >::iterator it; + std::map >::iterator it; for (it = cluster_dict.begin(); it != cluster_dict.end(); ++it) { cluster_ids.push_back(it->second); } @@ -583,7 +583,7 @@ void KClusterDlg::CreateControls() m_distance->Bind(wxEVT_CHOICE, &KClusterDlg::OnDistanceChoice, this); } -vector > KClusterDlg::_getMeanCenters(const vector >& solution) +std::vector > KClusterDlg::_getMeanCenters(const std::vector >& solution) { return AbstractClusterDlg::_getMeanCenters(solution); } @@ -764,7 +764,7 @@ bool KClusterDlg::CheckAllInputs() return true; } -bool KClusterDlg::Run(vector& clusters) +bool KClusterDlg::Run(std::vector& clusters) { if (GdaConst::use_gda_user_seed) { setrandomstate((int)GdaConst::gda_user_seed); @@ -785,7 +785,7 @@ bool KClusterDlg::Run(vector& clusters) int remainder = n_pass % nCPUs; int tot_threads = (quotient > 0) ? nCPUs : remainder; - map >::iterator it; + std::map >::iterator it; for (it=sub_clusters.begin(); it!=sub_clusters.end(); it++) { it->second.clear(); } @@ -832,7 +832,7 @@ bool KClusterDlg::Run(vector& clusters) for (it=sub_clusters.begin(); it!=sub_clusters.end(); it++) { double error = it->first; - vector& clst = it->second; + std::vector& clst = it->second; if (start == false ) { min_error = error; clusters = clst; @@ -860,7 +860,7 @@ void KClusterDlg::OnOK(wxCommandEvent& event ) } if (CheckAllInputs() == false) return; - vector clusters; + std::vector clusters; if (Run(clusters) == false) return; // sort result @@ -904,7 +904,7 @@ void KClusterDlg::OnOK(wxCommandEvent& event ) } if (col > 0) { - vector clusters_undef(rows, false); + std::vector clusters_undef(rows, false); table_int->SetColData(col, time, clusters); table_int->SetColUndefined(col, time, clusters_undef); } @@ -978,7 +978,7 @@ void KMeansDlg::doRun(int s1,int ncluster, int npass, int n_maxiter, int meth_se int s2 = s1==0 ? 0 : s1 + npass; kcluster(ncluster, rows, columns, input_data, mask, weight, transpose, npass, n_maxiter, method, dist, clusterid, &error, &ifound, bound_vals, min_bound, s1, s2); - vector clusters; + std::vector clusters; for (int i=0; i clusters; + std::vector clusters; for (int i=0; i > KMediansDlg::_getMeanCenters(const vector >& solutions) +std::vector > KMediansDlg::_getMeanCenters(const std::vector >& solutions) { int n_clusters = (int)solutions.size(); - vector > result(n_clusters); + std::vector > result(n_clusters); if (columns <= 0 || rows <= 0) return result; @@ -1070,7 +1070,7 @@ vector > KMediansDlg::_getMeanCenters(const vector >& //int start = IsUseCentroids() ? 2 : 0; for (int i=0; i medians; + std::vector medians; int end = columns; if (IsUseCentroids()) { end = columns - 2; @@ -1100,7 +1100,7 @@ vector > KMediansDlg::_getMeanCenters(const vector >& return result; } -double KMediansDlg::_calcSumOfSquaresMedian(const vector& cluster_ids) +double KMediansDlg::_calcSumOfSquaresMedian(const std::vector& cluster_ids) { if (cluster_ids.empty() || input_data==NULL || mask == NULL) return 0; @@ -1111,7 +1111,7 @@ double KMediansDlg::_calcSumOfSquaresMedian(const vector& cluster_ids) if (col_names[i] == "CENTX" || col_names[i] == "CENTY") { continue; } - vector vals; + std::vector vals; for (int j=0; j& cluster_ids) return ssq; } -double KMediansDlg::_calcSumOfManhattanMedian(const vector& cluster_ids) +double KMediansDlg::_calcSumOfManhattanMedian(const std::vector& cluster_ids) { if (cluster_ids.empty() || input_data==NULL || mask == NULL) return 0; @@ -1135,7 +1135,7 @@ double KMediansDlg::_calcSumOfManhattanMedian(const vector& cluster_ids) if (col_names[i] == "CENTX" || col_names[i] == "CENTY") { continue; } - vector vals; + std::vector vals; for (int j=0; j& cluster_ids) return ssq; } -wxString KMediansDlg::_additionalSummary(const vector >& solution, +wxString KMediansDlg::_additionalSummary(const std::vector >& solution, double& additional_ratio) { // computing Sum of Square Differences from Medoids @@ -1157,7 +1157,7 @@ wxString KMediansDlg::_additionalSummary(const vector >& solution, int dist_sel = m_distance->GetSelection(); double totss = 0, totwithiness, betweenss, ratio; - vector withinss, avgs; + std::vector withinss, avgs; wxString summary; @@ -1168,7 +1168,7 @@ wxString KMediansDlg::_additionalSummary(const vector >& solution, for (int i=0; i vals; + std::vector vals; for (int j=0; j >& solution, for (int i=0; i vals; + std::vector vals; for (int j=0; j& clusters) +bool KMedoidsDlg::Run(std::vector& clusters) { if (GdaConst::use_gda_user_seed) { setrandomstate((int)GdaConst::gda_user_seed); @@ -1647,12 +1647,12 @@ void KMedoidsDlg::doRun(int s1,int ncluster, int npass, int n_maxiter, int meth_ // do nothing } -vector > KMedoidsDlg::_getMeanCenters( - const vector >& solutions) +std::vector > KMedoidsDlg::_getMeanCenters( + const std::vector >& solutions) { // Using medoids instead of mean centers int n_clusters = (int)solutions.size(); - vector > result(n_clusters); + std::vector > result(n_clusters); // update order of medoids using solutions boost::unordered_map medoids_dict; @@ -1696,7 +1696,7 @@ vector > KMedoidsDlg::_getMeanCenters( } for (int i=0; i means; + std::vector means; int end = columns; if (IsUseCentroids()) { end = columns - 2; @@ -1763,7 +1763,7 @@ wxString KMedoidsDlg::_printConfiguration() return txt; } -double KMedoidsDlg::_calcSumOfSquaresMedoid(const vector& cluster_ids, int medoid_idx) +double KMedoidsDlg::_calcSumOfSquaresMedoid(const std::vector& cluster_ids, int medoid_idx) { if (cluster_ids.empty() || input_data==NULL || mask == NULL) return 0; @@ -1774,7 +1774,7 @@ double KMedoidsDlg::_calcSumOfSquaresMedoid(const vector& cluster_ids, int if (col_names[i] == "CENTX" || col_names[i] == "CENTY") { continue; } - vector vals; + std::vector vals; for (int j=0; j& cluster_ids, int return ssq; } -double KMedoidsDlg::_calcSumOfManhattanMedoid(const vector& cluster_ids, int medoid_idx) +double KMedoidsDlg::_calcSumOfManhattanMedoid(const std::vector& cluster_ids, int medoid_idx) { if (cluster_ids.empty() || input_data==NULL || mask == NULL) return 0; @@ -1798,7 +1798,7 @@ double KMedoidsDlg::_calcSumOfManhattanMedoid(const vector& cluster_ids, in if (col_names[i] == "CENTX" || col_names[i] == "CENTY") { continue; } - vector vals; + std::vector vals; for (int j=0; j& cluster_ids, in return ssq; } -wxString KMedoidsDlg::_additionalSummary(const vector >& solution, +wxString KMedoidsDlg::_additionalSummary(const std::vector >& solution, double& additional_ratio) { // computing Sum of Square Differences from Medoids @@ -1820,7 +1820,7 @@ wxString KMedoidsDlg::_additionalSummary(const vector >& solution, int dist_sel = m_distance->GetSelection(); double totss = 0, totwithiness, betweenss, ratio; - vector withinss, avgs; + std::vector withinss, avgs; wxString summary; @@ -1831,7 +1831,7 @@ wxString KMedoidsDlg::_additionalSummary(const vector >& solution, for (int i=0; i vals; + std::vector vals; for (int j=0; j >& solution, for (int i=0; i vals; + std::vector vals; for (int j=0; j clusters; + std::vector clusters; for (int i=0; i clusters; + std::vector clusters; if (Run(clusters) == false) return; // sort result @@ -2012,7 +2012,7 @@ void SpatialKMeansDlg::OnOK(wxCommandEvent& event ) } if (col > 0) { - vector clusters_undef(rows, false); + std::vector clusters_undef(rows, false); table_int->SetColData(col, time, clusters); table_int->SetColUndefined(col, time, clusters_undef); } diff --git a/DialogTools/KMeansDlg.h b/DialogTools/KMeansDlg.h index cb707ccd8..d66064176 100644 --- a/DialogTools/KMeansDlg.h +++ b/DialogTools/KMeansDlg.h @@ -31,8 +31,6 @@ #include "../VarTools.h" #include "AbstractClusterDlg.h" -using namespace std; - class Project; class TableInterface; @@ -85,14 +83,14 @@ class KClusterDlg : public AbstractClusterDlg virtual void ComputeDistMatrix(int dist_sel); virtual wxString _printConfiguration(); - virtual vector > _getMeanCenters(const vector >& solution); + virtual std::vector > _getMeanCenters(const std::vector >& solution); virtual void doRun(int s1, int ncluster, int npass, int n_maxiter, int meth_sel, int dist_sel, double min_bound, double* bound_vals)=0; //std::vector var_info; //std::vector col_ids; protected: - virtual bool Run(vector& clusters); + virtual bool Run(std::vector& clusters); virtual bool CheckAllInputs(); int n_cluster; @@ -125,7 +123,7 @@ class KClusterDlg : public AbstractClusterDlg int max_n_clusters; double** distmatrix; - map > sub_clusters; + std::map > sub_clusters; DECLARE_EVENT_TABLE() }; @@ -175,16 +173,16 @@ class KMediansDlg : public KClusterDlg virtual ~KMediansDlg(); virtual void doRun(int s1, int ncluster, int npass, int n_maxiter, int meth_sel, int dist_sel, double min_bound, double* bound_vals); - virtual vector > _getMeanCenters(const vector >& solution); + virtual std::vector > _getMeanCenters(const std::vector >& solution); protected: // get addtional content for summary,e.g. medoids (within distance to median) - virtual wxString _additionalSummary(const vector >& solution, + virtual wxString _additionalSummary(const std::vector >& solution, double& additional_ratio); - double _calcSumOfSquaresMedian(const vector& cluster_ids); + double _calcSumOfSquaresMedian(const std::vector& cluster_ids); - double _calcSumOfManhattanMedian(const vector& cluster_ids); + double _calcSumOfManhattanMedian(const std::vector& cluster_ids); }; //////////////////////////////////////////////////////////////////////// @@ -201,23 +199,23 @@ class KMedoidsDlg : public KClusterDlg virtual void ComputeDistMatrix(int dist_sel); virtual void doRun(int s1, int ncluster, int npass, int n_maxiter, int meth_sel, int dist_sel, double min_bound, double* bound_vals); - virtual vector > _getMeanCenters(const vector >& solution); + virtual std::vector > _getMeanCenters(const std::vector >& solution); virtual wxString _printConfiguration(); void OnMethodChoice(wxCommandEvent& evt); protected: - virtual bool Run(vector& clusters); + virtual bool Run(std::vector& clusters); virtual bool CheckAllInputs(); // get addtional content for summary,e.g. medoids (within distance to median) - virtual wxString _additionalSummary(const vector >& solution, + virtual wxString _additionalSummary(const std::vector >& solution, double& additional_ratio); int GetFirstMedoid(double** distmatrix); - double _calcSumOfSquaresMedoid(const vector& cluster_ids, int medoid_idx); + double _calcSumOfSquaresMedoid(const std::vector& cluster_ids, int medoid_idx); - double _calcSumOfManhattanMedoid(const vector& cluster_ids, int medoid_idx); + double _calcSumOfManhattanMedoid(const std::vector& cluster_ids, int medoid_idx); wxStaticText* txt_iterations; wxStaticText* txt_initmethod; diff --git a/DialogTools/MDSDlg.cpp b/DialogTools/MDSDlg.cpp index b0771a086..44548d727 100644 --- a/DialogTools/MDSDlg.cpp +++ b/DialogTools/MDSDlg.cpp @@ -391,7 +391,7 @@ void MDSDlg::OnOK(wxCommandEvent& event ) } int new_col = combo_n->GetSelection() == 0 ? 2 : 3; - vector > results; + std::vector > results; double stress = 0; int itel = 0; std::vector > output_vals; @@ -438,7 +438,7 @@ void MDSDlg::OnOK(wxCommandEvent& event ) } else { if (chk_poweriteration->IsChecked()) { // classical MDS with power iteration and full matrix - vector > distances = DataUtils::copyRaggedMatrix(ragged_distances, rows, rows); + std::vector > distances = DataUtils::copyRaggedMatrix(ragged_distances, rows, rows); if (dist == 'b') { for (size_t i=0; iGetFinalObjectiveFunction(); delete maxp; - vector > cluster_ids; + std::vector > cluster_ids; std::map > solution; for (int i=0; i clusters(rows, 0); - vector clusters_undef(rows, false); + std::vector clusters(rows, 0); + std::vector clusters_undef(rows, false); // sort result std::sort(cluster_ids.begin(), cluster_ids.end(), GenUtils::less_vectors); diff --git a/DialogTools/MultiQuantileLisaDlg.cpp b/DialogTools/MultiQuantileLisaDlg.cpp index 16847c561..12de5b96e 100644 --- a/DialogTools/MultiQuantileLisaDlg.cpp +++ b/DialogTools/MultiQuantileLisaDlg.cpp @@ -475,7 +475,7 @@ void MultiQuantileLisaDlg::OnOK(wxCommandEvent& event ) } GalElement* W = gw->gal; int t = 0; - vector local_t; + std::vector local_t; for (int v=0; v undefs; + std::vector undefs; for (int i=0; i sd = pca.sd(); - vector prop_of_var = pca.prop_of_var(); - vector cum_prop = pca.cum_prop(); + std::vector sd = pca.sd(); + std::vector prop_of_var = pca.prop_of_var(); + std::vector cum_prop = pca.cum_prop(); scores = pca.scores(); - vector el_cols = pca.eliminated_columns(); + std::vector el_cols = pca.eliminated_columns(); float kaiser = pca.kaiser(); thresh95 = pca.thresh95(); @@ -353,7 +353,7 @@ void PCASettingsDlg::OnOK(wxCommandEvent& event ) pca_log << _("\n\nSquared correlations:\n"); int num_pc = col_lim; - vector > pc_data(num_pc); + std::vector > pc_data(num_pc); for (unsigned int i=0; i col_size(num_pc, 0); - vector > corr_matrix(columns); + std::vector col_size(num_pc, 0); + std::vector > corr_matrix(columns); double corr, corr_sqr; for (int i=0; i col_data; + std::vector col_data; for (int j=0; j keys; + std::vector keys; wxString newline = basemap_sources.Find('\r') == wxNOT_FOUND ? "\n" : "\r\n"; wxStringTokenizer tokenizer(basemap_sources, newline); while ( tokenizer.HasMoreTokens() ) { @@ -634,7 +633,7 @@ void PreferenceDlg::ReadFromCache() { OGRDataAdapter& ogr_adapt = OGRDataAdapter::GetInstance(); - vector transp_h = ogr_adapt.GetHistory("transparency_highlighted"); + std::vector transp_h = ogr_adapt.GetHistory("transparency_highlighted"); if (!transp_h.empty()) { long transp_l = 0; wxString transp = transp_h[0]; @@ -642,7 +641,7 @@ void PreferenceDlg::ReadFromCache() GdaConst::transparency_highlighted = transp_l; } } - vector transp_uh = ogr_adapt.GetHistory("transparency_unhighlighted"); + std::vector transp_uh = ogr_adapt.GetHistory("transparency_unhighlighted"); if (!transp_uh.empty()) { long transp_l = 0; wxString transp = transp_uh[0]; @@ -650,7 +649,7 @@ void PreferenceDlg::ReadFromCache() GdaConst::transparency_unhighlighted = transp_l; } } - vector plot_transparency_unhighlighted = ogr_adapt.GetHistory("plot_transparency_unhighlighted"); + std::vector plot_transparency_unhighlighted = ogr_adapt.GetHistory("plot_transparency_unhighlighted"); if (!plot_transparency_unhighlighted.empty()) { long transp_l = 0; wxString transp = plot_transparency_unhighlighted[0]; @@ -658,7 +657,7 @@ void PreferenceDlg::ReadFromCache() GdaConst::plot_transparency_unhighlighted = transp_l; } } - vector basemap_sel = ogr_adapt.GetHistory("default_basemap_selection"); + std::vector basemap_sel = ogr_adapt.GetHistory("default_basemap_selection"); if (!basemap_sel.empty()) { long sel_l = 0; wxString sel = basemap_sel[0]; @@ -666,7 +665,7 @@ void PreferenceDlg::ReadFromCache() GdaConst::default_basemap_selection = sel_l; } } - vector basemap_default = ogr_adapt.GetHistory("use_basemap_by_default"); + std::vector basemap_default = ogr_adapt.GetHistory("use_basemap_by_default"); if (!basemap_default.empty()) { long sel_l = 0; wxString sel = basemap_default[0]; @@ -677,7 +676,7 @@ void PreferenceDlg::ReadFromCache() GdaConst::use_basemap_by_default = false; } } - vector crossht_sel = ogr_adapt.GetHistory("use_cross_hatching"); + std::vector crossht_sel = ogr_adapt.GetHistory("use_cross_hatching"); if (!crossht_sel.empty()) { long cross_l = 0; wxString cross = crossht_sel[0]; @@ -688,7 +687,7 @@ void PreferenceDlg::ReadFromCache() GdaConst::use_cross_hatching = false; } } - vector enable_transp_sel = ogr_adapt.GetHistory("gda_enable_set_transparency_windows"); + std::vector enable_transp_sel = ogr_adapt.GetHistory("gda_enable_set_transparency_windows"); if (!enable_transp_sel.empty()) { long enable_l = 0; wxString enable_transp = enable_transp_sel[0]; @@ -699,7 +698,7 @@ void PreferenceDlg::ReadFromCache() GdaConst::gda_enable_set_transparency_windows = false; } } - vector postgres_sys_sel = ogr_adapt.GetHistory("hide_sys_table_postgres"); + std::vector postgres_sys_sel = ogr_adapt.GetHistory("hide_sys_table_postgres"); if (!postgres_sys_sel.empty()) { long sel_l = 0; wxString sel = postgres_sys_sel[0]; @@ -710,7 +709,7 @@ void PreferenceDlg::ReadFromCache() GdaConst::hide_sys_table_postgres = false; } } - vector hide_sys_table_sqlite = ogr_adapt.GetHistory("hide_sys_table_sqlite"); + std::vector hide_sys_table_sqlite = ogr_adapt.GetHistory("hide_sys_table_sqlite"); if (!hide_sys_table_sqlite.empty()) { long sel_l = 0; wxString sel = hide_sys_table_sqlite[0]; @@ -721,7 +720,7 @@ void PreferenceDlg::ReadFromCache() GdaConst::hide_sys_table_sqlite = false; } } - vector disable_crash_detect = ogr_adapt.GetHistory("disable_crash_detect"); + std::vector disable_crash_detect = ogr_adapt.GetHistory("disable_crash_detect"); if (!disable_crash_detect.empty()) { long sel_l = 0; wxString sel = disable_crash_detect[0]; @@ -732,7 +731,7 @@ void PreferenceDlg::ReadFromCache() GdaConst::disable_crash_detect = false; } } - vector disable_auto_upgrade = ogr_adapt.GetHistory("disable_auto_upgrade"); + std::vector disable_auto_upgrade = ogr_adapt.GetHistory("disable_auto_upgrade"); if (!disable_auto_upgrade.empty()) { long sel_l = 0; wxString sel = disable_auto_upgrade[0]; @@ -744,7 +743,7 @@ void PreferenceDlg::ReadFromCache() } } - vector show_recent_sample_connect_ds_dialog = ogr_adapt.GetHistory("show_recent_sample_connect_ds_dialog"); + std::vector show_recent_sample_connect_ds_dialog = ogr_adapt.GetHistory("show_recent_sample_connect_ds_dialog"); if (!show_recent_sample_connect_ds_dialog.empty()) { long sel_l = 0; wxString sel = show_recent_sample_connect_ds_dialog[0]; @@ -756,7 +755,7 @@ void PreferenceDlg::ReadFromCache() } } - vector show_csv_configure_in_merge = ogr_adapt.GetHistory("show_csv_configure_in_merge"); + std::vector show_csv_configure_in_merge = ogr_adapt.GetHistory("show_csv_configure_in_merge"); if (!show_csv_configure_in_merge.empty()) { long sel_l = 0; wxString sel = show_csv_configure_in_merge[0]; @@ -767,7 +766,7 @@ void PreferenceDlg::ReadFromCache() GdaConst::show_csv_configure_in_merge = false; } } - vector enable_high_dpi_support = ogr_adapt.GetHistory("enable_high_dpi_support"); + std::vector enable_high_dpi_support = ogr_adapt.GetHistory("enable_high_dpi_support"); if (!enable_high_dpi_support.empty()) { long sel_l = 0; wxString sel = enable_high_dpi_support[0]; @@ -778,7 +777,7 @@ void PreferenceDlg::ReadFromCache() GdaConst::enable_high_dpi_support = false; } } - vector gdal_http_timeout = ogr_adapt.GetHistory("gdal_http_timeout"); + std::vector gdal_http_timeout = ogr_adapt.GetHistory("gdal_http_timeout"); if (!gdal_http_timeout.empty()) { long sel_l = 0; wxString sel = gdal_http_timeout[0]; @@ -787,7 +786,7 @@ void PreferenceDlg::ReadFromCache() } } - vector gda_datetime_formats_str = ogr_adapt.GetHistory("gda_datetime_formats_str"); + std::vector gda_datetime_formats_str = ogr_adapt.GetHistory("gda_datetime_formats_str"); if (!gda_datetime_formats_str.empty()) { wxString patterns = gda_datetime_formats_str[0]; wxStringTokenizer tokenizer(patterns, ","); @@ -799,7 +798,7 @@ void PreferenceDlg::ReadFromCache() GdaConst::gda_datetime_formats_str = patterns; } - vector gda_user_seed = ogr_adapt.GetHistory("gda_user_seed"); + std::vector gda_user_seed = ogr_adapt.GetHistory("gda_user_seed"); if (!gda_user_seed.empty()) { long sel_l = 0; wxString sel = gda_user_seed[0]; @@ -807,7 +806,7 @@ void PreferenceDlg::ReadFromCache() GdaConst::gda_user_seed = sel_l; } } - vector use_gda_user_seed = ogr_adapt.GetHistory("use_gda_user_seed"); + std::vector use_gda_user_seed = ogr_adapt.GetHistory("use_gda_user_seed"); if (!use_gda_user_seed.empty()) { long sel_l = 0; wxString sel = use_gda_user_seed[0]; @@ -821,7 +820,7 @@ void PreferenceDlg::ReadFromCache() } } - vector gda_set_cpu_cores = ogr_adapt.GetHistory("gda_set_cpu_cores"); + std::vector gda_set_cpu_cores = ogr_adapt.GetHistory("gda_set_cpu_cores"); if (!gda_set_cpu_cores.empty()) { long sel_l = 0; wxString sel = gda_set_cpu_cores[0]; @@ -832,7 +831,7 @@ void PreferenceDlg::ReadFromCache() GdaConst::gda_set_cpu_cores = false; } } - vector gda_cpu_cores = ogr_adapt.GetHistory("gda_cpu_cores"); + std::vector gda_cpu_cores = ogr_adapt.GetHistory("gda_cpu_cores"); if (!gda_cpu_cores.empty()) { long sel_l = 0; wxString sel = gda_cpu_cores[0]; @@ -841,7 +840,7 @@ void PreferenceDlg::ReadFromCache() } } - vector gda_eigen_tol = ogr_adapt.GetHistory("gda_eigen_tol"); + std::vector gda_eigen_tol = ogr_adapt.GetHistory("gda_eigen_tol"); if (!gda_eigen_tol.empty()) { double sel_l = 0; wxString sel = gda_eigen_tol[0]; @@ -850,7 +849,7 @@ void PreferenceDlg::ReadFromCache() } } - vector gda_ui_language = ogr_adapt.GetHistory("gda_ui_language"); + std::vector gda_ui_language = ogr_adapt.GetHistory("gda_ui_language"); if (!gda_ui_language.empty()) { long sel_l = 0; wxString sel = gda_ui_language[0]; @@ -859,7 +858,7 @@ void PreferenceDlg::ReadFromCache() } } - vector gda_use_gpu = ogr_adapt.GetHistory("gda_use_gpu"); + std::vector gda_use_gpu = ogr_adapt.GetHistory("gda_use_gpu"); if (!gda_use_gpu.empty()) { long sel_l = 0; wxString sel = gda_use_gpu[0]; @@ -871,7 +870,7 @@ void PreferenceDlg::ReadFromCache() } } - vector gda_create_csvt = ogr_adapt.GetHistory("gda_create_csvt"); + std::vector gda_create_csvt = ogr_adapt.GetHistory("gda_create_csvt"); if (!gda_create_csvt.empty()) { long sel_l = 0; wxString sel = gda_create_csvt[0]; @@ -883,7 +882,7 @@ void PreferenceDlg::ReadFromCache() } } - vector gda_disp_decimals = ogr_adapt.GetHistory("gda_displayed_decimals"); + std::vector gda_disp_decimals = ogr_adapt.GetHistory("gda_displayed_decimals"); if (!gda_disp_decimals.empty()) { long sel_l = 0; wxString sel = gda_disp_decimals[0]; @@ -892,7 +891,7 @@ void PreferenceDlg::ReadFromCache() } } - vector gda_autoweight_stop = ogr_adapt.GetHistory("gda_autoweight_stop"); + std::vector gda_autoweight_stop = ogr_adapt.GetHistory("gda_autoweight_stop"); if (!gda_autoweight_stop.empty()) { double sel_l = 0; wxString sel = gda_autoweight_stop[0]; @@ -901,7 +900,7 @@ void PreferenceDlg::ReadFromCache() } } - vector gda_draw_map_labels = ogr_adapt.GetHistory("gda_draw_map_labels"); + std::vector gda_draw_map_labels = ogr_adapt.GetHistory("gda_draw_map_labels"); if (!gda_draw_map_labels.empty()) { long sel_l = 0; wxString sel = gda_draw_map_labels[0]; @@ -912,7 +911,7 @@ void PreferenceDlg::ReadFromCache() GdaConst::gda_draw_map_labels = false; } } - vector gda_map_label_font_size = ogr_adapt.GetHistory("gda_map_label_font_size"); + std::vector gda_map_label_font_size = ogr_adapt.GetHistory("gda_map_label_font_size"); if (!gda_map_label_font_size.empty()) { long sel_l = 0; wxString sel = gda_map_label_font_size[0]; @@ -922,7 +921,7 @@ void PreferenceDlg::ReadFromCache() } // following are not in this UI, but still global variable - vector gda_user_email = ogr_adapt.GetHistory("gda_user_email"); + std::vector gda_user_email = ogr_adapt.GetHistory("gda_user_email"); if (!gda_user_email.empty()) { wxString email = gda_user_email[0]; GdaConst::gda_user_email = email; diff --git a/DialogTools/PreferenceDlg.h b/DialogTools/PreferenceDlg.h index 56848db07..fc833d39d 100644 --- a/DialogTools/PreferenceDlg.h +++ b/DialogTools/PreferenceDlg.h @@ -34,8 +34,6 @@ #include "../DataViewer/TableState.h" #include "../HighlightStateObserver.h" -using namespace std; - //////////////////////////////////////////////////////////////////////////////// // // PreferenceDlg diff --git a/DialogTools/ProjectInfoDlg.cpp b/DialogTools/ProjectInfoDlg.cpp index 170becfe6..bdc263ac8 100644 --- a/DialogTools/ProjectInfoDlg.cpp +++ b/DialogTools/ProjectInfoDlg.cpp @@ -24,15 +24,13 @@ #include "../Project.h" #include "ProjectInfoDlg.h" -using namespace std; - ProjectInfoDlg::ProjectInfoDlg(Project* project) : wxDialog(NULL, wxID_ANY, _("Project Information"), wxDefaultPosition, wxSize(250, 150), wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER) { wxLogMessage("Open ProjectInfoDlg."); - vector key; - vector val; + std::vector key; + std::vector val; key.push_back("Project Title"); val.push_back(project->GetProjectTitle()); diff --git a/DialogTools/PublishDlg.cpp b/DialogTools/PublishDlg.cpp index 1dbda0528..c2cdb163b 100644 --- a/DialogTools/PublishDlg.cpp +++ b/DialogTools/PublishDlg.cpp @@ -88,9 +88,6 @@ void PublishDlg::OnOkClick( wxCommandEvent& event ) EndDialog(wxID_OK); } - -using namespace std; - GeoDaWebProxy::GeoDaWebProxy() { api_key = CartoDBProxy::GetInstance().GetKey(); @@ -98,7 +95,7 @@ GeoDaWebProxy::GeoDaWebProxy() } -GeoDaWebProxy::GeoDaWebProxy(const string& _user_name, const string& _api_key) +GeoDaWebProxy::GeoDaWebProxy(const std::string& _user_name, const std::string& _api_key) { user_name = _user_name; api_key = _api_key; @@ -115,7 +112,7 @@ void GeoDaWebProxy::Publish(Project* p, wxString& title, wxString& description) if (p == NULL) return; - ostringstream ss; + std::ostringstream ss; // table_name ss << buildParameter("table_name", p->layername); @@ -127,11 +124,11 @@ void GeoDaWebProxy::Publish(Project* p, wxString& title, wxString& description) // maps & plots FramesManager* fm = p->GetFramesManager(); - list observers(fm->getCopyObservers()); - list::iterator it; + std::list observers(fm->getCopyObservers()); + std::list::iterator it; for (it=observers.begin(); it != observers.end(); ++it) { if (LisaMapFrame* w = dynamic_cast(*it)) { - vector clusters; + std::vector clusters; w->GetVizInfo(clusters); if (!clusters.empty()) { ss << "&" << buildParameter("lisa", clusters); @@ -184,7 +181,7 @@ void GeoDaWebProxy::Publish(Project* p, wxString& title, wxString& description) continue; } if (ScatterPlotMatFrame* w = dynamic_cast(*it)) { - vector vars; + std::vector vars; w->GetVizInfo(vars); if (!vars.empty()) { ss << "&" << buildParameter("scattermatrix", vars); @@ -206,9 +203,9 @@ void GeoDaWebProxy::Publish(Project* p, wxString& title, wxString& description) } // submit request - string parameter = ss.str(); + std::string parameter = ss.str(); - string returnUrl = doPost(parameter); + std::string returnUrl = doPost(parameter); // launch browser with return url wxString published_url(returnUrl); @@ -216,23 +213,23 @@ void GeoDaWebProxy::Publish(Project* p, wxString& title, wxString& description) } -void GeoDaWebProxy::SetKey(const string& key) { +void GeoDaWebProxy::SetKey(const std::string& key) { api_key = key; } -void GeoDaWebProxy::SetUserName(const string& name) { +void GeoDaWebProxy::SetUserName(const std::string& name) { user_name = name; } -string GeoDaWebProxy::buildParameter(map >& val) +std::string GeoDaWebProxy::buildParameter(std::map >& val) { - ostringstream par; - map >::iterator it; + std::ostringstream par; + std::map >::iterator it; par << "{" ; for (it=val.begin(); it != val.end(); ++it) { wxString clr( it->first); - vector& ids = it->second; + std::vector& ids = it->second; par << "\"" << clr.mb_str() << "\": ["; for (size_t i=0; i< ids.size(); i++) { @@ -246,24 +243,24 @@ string GeoDaWebProxy::buildParameter(map >& val) return par.str(); } -string GeoDaWebProxy::buildParameter(const char* key, string& val) +std::string GeoDaWebProxy::buildParameter(const char* key, std::string& val) { - ostringstream par; + std::ostringstream par; par << key << "=" << val; return par.str(); } -string GeoDaWebProxy::buildParameter(const char* key, wxString& val) +std::string GeoDaWebProxy::buildParameter(const char* key, wxString& val) { - ostringstream par; + std::ostringstream par; par << key << "=" << val.mb_str(); return par.str(); } -string GeoDaWebProxy::buildParameter(const char* key, vector& val) +std::string GeoDaWebProxy::buildParameter(const char* key, std::vector& val) { - ostringstream par; + std::ostringstream par; par << key << "=" << "["; for (size_t i=0, n=val.size(); i& val) return par.str(); } -string GeoDaWebProxy::buildParameter(const char* key, vector& val) +std::string GeoDaWebProxy::buildParameter(const char* key, std::vector& val) { - ostringstream par; + std::ostringstream par; par << key << "=" << "["; for (size_t i=0, n=val.size(); i& val) return par.str(); } -string GeoDaWebProxy::buildBaseUrl() +std::string GeoDaWebProxy::buildBaseUrl() { - ostringstream url; + std::ostringstream url; url << "https://webpool.csf.asu.edu/xun/myapp/geoda_publish/"; //url << "http://127.0.0.1:8000/myapp/geoda_publish/"; return url.str(); @@ -301,14 +298,14 @@ size_t write_data(char *ptr, size_t size, size_t nmemb, void *userdata) { } -void GeoDaWebProxy::doGet(string& parameter) +void GeoDaWebProxy::doGet(std::string& parameter) { CURL* curl; CURLcode res; curl = curl_easy_init(); if (curl) { - string url = buildBaseUrl() + "?api_key=" + api_key +"&" + parameter; + std::string url = buildBaseUrl() + "?api_key=" + api_key +"&" + parameter; curl_easy_setopt(curl, CURLOPT_URL, url.c_str()); @@ -337,19 +334,19 @@ void GeoDaWebProxy::doGet(string& parameter) } -string GeoDaWebProxy::doPost(const string& _parameter) +std::string GeoDaWebProxy::doPost(const std::string& _parameter) { CURL* curl; CURLcode res; - string parameter = _parameter; + std::string parameter = _parameter; //curl_global_init(CURL_GLOBAL_ALL); - ostringstream out; + std::ostringstream out; curl = curl_easy_init(); if (curl) { - string url = buildBaseUrl(); + std::string url = buildBaseUrl(); parameter = "api_key=" + api_key + "&" + parameter; curl_easy_setopt(curl, CURLOPT_URL, url.c_str()); diff --git a/DialogTools/PublishDlg.h b/DialogTools/PublishDlg.h index 23daef644..a1994861e 100644 --- a/DialogTools/PublishDlg.h +++ b/DialogTools/PublishDlg.h @@ -32,41 +32,38 @@ class Project; -using namespace std; - - class GeoDaWebProxy { public: GeoDaWebProxy(); - GeoDaWebProxy(const string& _user_name, const string& _api_key); + GeoDaWebProxy(const std::string& _user_name, const std::string& _api_key); ~GeoDaWebProxy(); - void SetKey(const string& key); - void SetUserName(const string& name); + void SetKey(const std::string& key); + void SetUserName(const std::string& name); void Publish(Project* p, wxString& title, wxString& description); private: - string api_key; - string user_name; - string api_url; + std::string api_key; + std::string user_name; + std::string api_url; - string buildParameter(const char* key, string& val); - string buildParameter(const char* key, wxString& val); - string buildParameter(const char* key, vector& val); - string buildParameter(const char* key, vector& val); - string buildParameter(map >& val); + std::string buildParameter(const char* key, std::string& val); + std::string buildParameter(const char* key, wxString& val); + std::string buildParameter(const char* key, std::vector& val); + std::string buildParameter(const char* key, std::vector& val); + std::string buildParameter(std::map >& val); - void doGet(string& parameter); - string doPost(const string& parameter); + void doGet(std::string& parameter); + std::string doPost(const std::string& parameter); - string buildBaseUrl(); + std::string buildBaseUrl(); }; class PublishDlg: public wxDialog diff --git a/DialogTools/RedcapDlg.cpp b/DialogTools/RedcapDlg.cpp index 85f1c8975..ce7666781 100644 --- a/DialogTools/RedcapDlg.cpp +++ b/DialogTools/RedcapDlg.cpp @@ -389,7 +389,7 @@ void RedcapDlg::OnSaveTree(wxCommandEvent& event ) if (col < 0) { return; } - vector ids; + std::vector ids; table_int->GetColData(col, 0, ids); wxFileName fname = wxFileName(dialog.GetPath()); @@ -407,8 +407,8 @@ void RedcapDlg::OnSaveTree(wxCommandEvent& event ) header << id; file.AddLine(header); - vector > cluster_ids = redcap->GetRegions(); - map nid_cid; // node id -> cluster id + std::vector > cluster_ids = redcap->GetRegions(); + std::map nid_cid; // node id -> cluster id for (int c=0; cPartitioning(n_regions); - vector > cluster_ids = redcap->GetRegions(); + std::vector > cluster_ids = redcap->GetRegions(); int ncluster = cluster_ids.size(); @@ -611,8 +611,8 @@ void RedcapDlg::OnOK(wxCommandEvent& event ) wxMessageDialog dlg(NULL, warn_str, _("Warning"), wxOK | wxICON_WARNING); dlg.ShowModal(); } - vector clusters(rows, 0); - vector clusters_undef(rows, false); + std::vector clusters(rows, 0); + std::vector clusters_undef(rows, false); // sort result std::sort(cluster_ids.begin(), cluster_ids.end(), GenUtils::less_vectors); diff --git a/DialogTools/RedcapDlg.h b/DialogTools/RedcapDlg.h index 8e44275ee..cd1053c3c 100644 --- a/DialogTools/RedcapDlg.h +++ b/DialogTools/RedcapDlg.h @@ -30,8 +30,6 @@ #include "AbstractClusterDlg.h" #include "../Algorithms/redcap.h" -using namespace std; - class Project; class TableInterface; diff --git a/DialogTools/RegressionDlg.cpp b/DialogTools/RegressionDlg.cpp index 4ee2e59bd..d0f466124 100644 --- a/DialogTools/RegressionDlg.cpp +++ b/DialogTools/RegressionDlg.cpp @@ -496,8 +496,8 @@ void RegressionDlg::OnRunClick( wxCommandEvent& event ) int cnt = 0; for (int i=0; i nbrs = gw->gal[i].GetNbrs(); - vector nbrs_w = gw->gal[i].GetNbrWeights(); + std::vector nbrs = gw->gal[i].GetNbrs(); + std::vector nbrs_w = gw->gal[i].GetNbrWeights(); int n_idx = 0; for (int j=0; jappend((char*)ptr, 0, size*count); + ((std::string*)stream)->append((char*)ptr, 0, size*count); return size*count; } -string CreateIssueOnGithub(wxString& post_data) +std::string CreateIssueOnGithub(wxString& post_data) { std::vector tester_ids = OGRDataAdapter::GetInstance().GetHistory("tester_id"); if (tester_ids.empty()) return ""; @@ -162,7 +161,7 @@ string CreateIssueOnGithub(wxString& post_data) wxString header_auth = "Authorization: token " + tester_id; wxString header_user_agent = "User-Agent: GeoDaTester"; - string response; + std::string response; CURL* curl = curl_easy_init(); CURLcode res; if (curl) { @@ -364,7 +363,7 @@ bool ReportBugDlg::CreateIssue(wxString title, wxString body) json_msg << labels; json_msg << "}"; - string result = CreateIssueOnGithub(json_msg); + std::string result = CreateIssueOnGithub(json_msg); // parse results if (!result.empty()) { json_spirit::Value v; diff --git a/DialogTools/ReportBugDlg.h b/DialogTools/ReportBugDlg.h index f1a500654..4da3dd5f4 100644 --- a/DialogTools/ReportBugDlg.h +++ b/DialogTools/ReportBugDlg.h @@ -33,9 +33,6 @@ #include "../HLStateInt.h" #include "../HighlightStateObserver.h" -using namespace std; - - //////////////////////////////////////////////////////////////////////////////// // // WelcomeSelectionStyleDlg diff --git a/DialogTools/SCHCDlg.cpp b/DialogTools/SCHCDlg.cpp index 1e8839908..3ccf03da0 100644 --- a/DialogTools/SCHCDlg.cpp +++ b/DialogTools/SCHCDlg.cpp @@ -77,7 +77,7 @@ void SCHCDlg::OnSave(wxCommandEvent& event ) } } -bool SCHCDlg::Run(vector& clusters) +bool SCHCDlg::Run(std::vector& clusters) { // NOTE input_data should be retrieved first!! // get input: weights (auto) diff --git a/DialogTools/SCHCDlg.h b/DialogTools/SCHCDlg.h index 0404a07d4..82beb1530 100644 --- a/DialogTools/SCHCDlg.h +++ b/DialogTools/SCHCDlg.h @@ -44,7 +44,7 @@ class SCHCDlg : public HClusterDlg void OnSave(wxCommandEvent& event ); protected: - virtual bool Run(vector& clusters); + virtual bool Run(std::vector& clusters); void CutTree(int rows, GdaNode* htree, int n_cluster, std::vector& clusters); diff --git a/DialogTools/SkaterDlg.cpp b/DialogTools/SkaterDlg.cpp index 22f5d772d..433178073 100644 --- a/DialogTools/SkaterDlg.cpp +++ b/DialogTools/SkaterDlg.cpp @@ -222,7 +222,7 @@ void SkaterDlg::OnSaveTree(wxCommandEvent& event ) if (col < 0) { return; } - vector ids; + std::vector ids; table_int->GetColData(col, 0, ids); wxFileName fname = wxFileName(dialog.GetPath()); @@ -240,8 +240,8 @@ void SkaterDlg::OnSaveTree(wxCommandEvent& event ) header << id; file.AddLine(header); - vector > cluster_ids = skater->GetRegions(); - map nid_cid; // node id -> cluster id + std::vector > cluster_ids = skater->GetRegions(); + std::map nid_cid; // node id -> cluster id for (int c=0; c, bool> access_dict; + boost::unordered_map, bool> access_dict; for (int i=0; igal[i].Size(); j++) { int nbr = gw->gal[i][j]; - pair i_nbr(i, nbr); - pair nbr_i(nbr, i); + std::pair i_nbr(i, nbr); + std::pair nbr_i(nbr, i); if (access_dict.find(i_nbr) != access_dict.end() || access_dict.find(nbr_i) != access_dict.end() ) { @@ -579,7 +579,7 @@ void SkaterDlg::OnOK(wxCommandEvent& event ) skater->Partitioning(n_regions); - vector > cluster_ids = skater->GetRegions(); + std::vector > cluster_ids = skater->GetRegions(); int ncluster = cluster_ids.size(); @@ -590,8 +590,8 @@ void SkaterDlg::OnOK(wxCommandEvent& event ) wxMessageDialog dlg(NULL, warn_str, _("Warning"), wxOK | wxICON_WARNING); dlg.ShowModal(); } - vector clusters(rows, 0); - vector clusters_undef(rows, false); + std::vector clusters(rows, 0); + std::vector clusters_undef(rows, false); // sort result diff --git a/DialogTools/SpatialJoinDlg.cpp b/DialogTools/SpatialJoinDlg.cpp index 4ede75a11..4f665242e 100644 --- a/DialogTools/SpatialJoinDlg.cpp +++ b/DialogTools/SpatialJoinDlg.cpp @@ -22,8 +22,6 @@ #include "ConnectDatasourceDlg.h" #include "SpatialJoinDlg.h" -using namespace std; - SpatialJoinWorker::SpatialJoinWorker(BackgroundMapLayer* _ml, Project* _project) { duplicate_count = false; @@ -57,7 +55,7 @@ std::vector > SpatialJoinWorker::GetJoinResults() return spatial_joins; } -vector SpatialJoinWorker::GetResults() +std::vector SpatialJoinWorker::GetResults() { return spatial_counts; } @@ -201,7 +199,7 @@ void CountPointsInPolygon::sub_run(int start, int end) AssignPolygonToPoint::AssignPolygonToPoint(BackgroundMapLayer* _ml, - Project* _project, vector& _poly_ids) + Project* _project, std::vector& _poly_ids) : SpatialJoinWorker(_ml, _project) { join_variable = false; @@ -314,7 +312,7 @@ void CountLinesInPolygon::sub_run(int start, int end) AssignPolygonToLine::AssignPolygonToLine(BackgroundMapLayer* _ml, Project* _project, - vector& _poly_ids) + std::vector& _poly_ids) : SpatialJoinWorker(_ml, _project) { join_variable = false; @@ -618,7 +616,7 @@ void SpatialJoinDlg::OnRemoveRow(wxCommandEvent& e) void SpatialJoinDlg::InitMapList() { map_list->Clear(); - map::iterator it; + std::map::iterator it; for (it=project->bg_maps.begin(); it!=project->bg_maps.end(); it++) { wxString name = it->first; @@ -643,7 +641,7 @@ void SpatialJoinDlg::UpdateFieldList(wxString name) project->GetShapeType() != Shapefile::POLYGON ) { // assign polygon to point field_list->Clear(); - vector field_names = ml->GetIntegerFieldNames(); + std::vector field_names = ml->GetIntegerFieldNames(); field_list->Append(""); for (int i=0; iAppend(field_names[i]); @@ -674,7 +672,7 @@ void SpatialJoinDlg::UpdateFieldList(wxString name) join_op_st->Show(); // spatial join join_var_list->Clear(); - vector field_names = ml->GetNumericFieldNames(); + std::vector field_names = ml->GetNumericFieldNames(); for (int i=0; iAppend(field_names[i]); } @@ -729,7 +727,7 @@ void SpatialJoinDlg::OnOK(wxCommandEvent& e) if (project->GetShapeType() == Shapefile::POINT_TYP || project->GetShapeType() == Shapefile::POLY_LINE) { // working layer is Points/Lines - vector poly_ids; + std::vector poly_ids; for (int i=0; i > spatial_joins = sj->GetJoinResults(); int new_col = (int)spatial_joins.size(); std::vector new_data(new_col); - vector undefs(project->GetNumRecords(), false); + std::vector undefs(project->GetNumRecords(), false); for (int i=0; i spatial_counts = sj->GetResults(); + std::vector spatial_counts = sj->GetResults(); int new_col = 1; std::vector new_data(new_col); - vector undefs(project->GetNumRecords(), false); + std::vector undefs(project->GetNumRecords(), false); new_data[0].l_val = &spatial_counts; new_data[0].label = label; new_data[0].field_default = field_name; diff --git a/DialogTools/SpatialJoinDlg.h b/DialogTools/SpatialJoinDlg.h index fc0765a35..7f5f94dbd 100644 --- a/DialogTools/SpatialJoinDlg.h +++ b/DialogTools/SpatialJoinDlg.h @@ -92,20 +92,20 @@ class CountPolygonInPolygon : public SpatialJoinWorker class AssignPolygonToPoint : public SpatialJoinWorker { protected: - vector poly_ids; + std::vector poly_ids; rtree_pt_2d_t rtree; public: - AssignPolygonToPoint(BackgroundMapLayer* ml, Project* project, vector& poly_ids); + AssignPolygonToPoint(BackgroundMapLayer* ml, Project* project, std::vector& poly_ids); virtual void sub_run(int start, int end); }; class AssignPolygonToLine : public SpatialJoinWorker { protected: - vector poly_ids; + std::vector poly_ids; rtree_box_2d_t rtree; public: - AssignPolygonToLine(BackgroundMapLayer* ml, Project* project, vector& poly_ids); + AssignPolygonToLine(BackgroundMapLayer* ml, Project* project, std::vector& poly_ids); virtual void sub_run(int start, int end); }; diff --git a/DialogTools/SpectralClusteringDlg.cpp b/DialogTools/SpectralClusteringDlg.cpp index addb9b5b8..bc9d62c04 100644 --- a/DialogTools/SpectralClusteringDlg.cpp +++ b/DialogTools/SpectralClusteringDlg.cpp @@ -639,7 +639,7 @@ bool SpectralClusteringDlg::CheckAllInputs() return true; } -bool SpectralClusteringDlg::Run(vector& clusters) +bool SpectralClusteringDlg::Run(std::vector& clusters) { if (GdaConst::use_gda_user_seed) { setrandomstate((int)GdaConst::gda_user_seed); @@ -746,7 +746,7 @@ void SpectralClusteringDlg::OnOK(wxCommandEvent& event ) } if (col > 0) { - vector clusters_undef(rows, false); + std::vector clusters_undef(rows, false); table_int->SetColData(col, time, clusters); table_int->SetColUndefined(col, time, clusters_undef); } diff --git a/DialogTools/SpectralClusteringDlg.h b/DialogTools/SpectralClusteringDlg.h index 1a6d56227..de53030d1 100644 --- a/DialogTools/SpectralClusteringDlg.h +++ b/DialogTools/SpectralClusteringDlg.h @@ -61,7 +61,7 @@ class SpectralClusteringDlg : public AbstractClusterDlg virtual wxString _printConfiguration(); protected: - virtual bool Run(vector& clusters); + virtual bool Run(std::vector& clusters); virtual bool CheckAllInputs(); void UpdateGaussian(wxCommandEvent& event); diff --git a/DialogTools/TimeEditorDlg.cpp b/DialogTools/TimeEditorDlg.cpp index 82add0079..4936d559d 100644 --- a/DialogTools/TimeEditorDlg.cpp +++ b/DialogTools/TimeEditorDlg.cpp @@ -180,7 +180,6 @@ void TimeEditorDlg::OnSize(wxSizeEvent& ev) void TimeEditorDlg::OnEndEditItem(wxListEvent& ev) { - using namespace std; LOG_MSG(wxString::Format("In TimeEditorDlg::OnEndEditItem, item %d", (int) ev.GetItem().GetId())); // ensure that new time label is unique and not empty diff --git a/DialogTools/VarGroupingEditorDlg.cpp b/DialogTools/VarGroupingEditorDlg.cpp index a28439dfe..39a10767d 100644 --- a/DialogTools/VarGroupingEditorDlg.cpp +++ b/DialogTools/VarGroupingEditorDlg.cpp @@ -100,8 +100,6 @@ BEGIN_EVENT_TABLE( VarGroupingEditorDlg, wxDialog ) VarGroupingEditorDlg::OnLoadFromGda ) END_EVENT_TABLE() -using namespace std; - VarGroupingEditorDlg::VarGroupingEditorDlg(Project* project_p, wxWindow* parent, const wxString& title, @@ -548,8 +546,8 @@ void VarGroupingEditorDlg::OnUngroupClick( wxCommandEvent& event ) int tms = table_int->GetColTimeSteps(col); - set col_nms_set; - vector col_nms(tms); + std::set col_nms_set; + std::vector col_nms(tms); for (int t=0; tGetColName(col, t); if (nm.IsEmpty()) @@ -601,21 +599,21 @@ void VarGroupingEditorDlg::OnMoveUpClick( wxCommandEvent& event ) int item_cnt = include_list->GetItemCount(); int sel_count = include_list->GetSelectedItemCount(); if (sel_count == 0) return; - list sel_pos = GetListSel(include_list); + std::list sel_pos = GetListSel(include_list); if (sel_pos.front() == 0) return; - set sel_pos_set; + std::set sel_pos_set; BOOST_FOREACH(int i, sel_pos) sel_pos_set.insert(i); - list unsel_pos; + std::list unsel_pos; for (int i=0; i orig(item_cnt); + std::vector orig(item_cnt); for (int i=0; iGetItemText(i, 1); UnselectAll(include_list); - set new_pos_set; + std::set new_pos_set; BOOST_FOREACH(int i, sel_pos) { include_list->SetItem(i-1, 1, orig[i]); SelectItem(include_list, i-1); @@ -639,23 +637,23 @@ void VarGroupingEditorDlg::OnMoveDownClick( wxCommandEvent& event ) int item_cnt = include_list->GetItemCount(); int sel_count = include_list->GetSelectedItemCount(); if (sel_count == 0) return; - list sel_pos = GetListSel(include_list); + std::list sel_pos = GetListSel(include_list); if (sel_pos.back() == item_cnt-1) return; - set sel_pos_set; + std::set sel_pos_set; BOOST_FOREACH(int i, sel_pos) sel_pos_set.insert(i); - list unsel_pos; + std::list unsel_pos; for (int i=0; i orig(item_cnt); + std::vector orig(item_cnt); for (int i=0; iGetItemText(i, 1); UnselectAll(include_list); - set new_pos_set; + std::set new_pos_set; BOOST_FOREACH(int i, sel_pos) { include_list->SetItem(i+1, 1, orig[i]); SelectItem(include_list, i+1); @@ -674,10 +672,10 @@ void VarGroupingEditorDlg::sortColumn(int col, bool asc) { if (!all_init) return; - list all_str = GetListAllStrs(include_list, col); - list nm_locs; - vector sorted_nms; - set sel_nms; + std::list all_str = GetListAllStrs(include_list, col); + std::list nm_locs; + std::vector sorted_nms; + std::set sel_nms; int loc=0; BOOST_FOREACH(const wxString& s, all_str) { if (!s.IsEmpty() && s != GdaConst::placeholder_str) { @@ -695,11 +693,11 @@ void VarGroupingEditorDlg::sortColumn(int col, bool asc) sort_asc = !sort_asc; if (asc) - sort(sorted_nms.begin(), sorted_nms.end()); + std::sort(sorted_nms.begin(), sorted_nms.end()); else - sort(sorted_nms.begin(), sorted_nms.end(), greater()); + std::sort(sorted_nms.begin(), sorted_nms.end(), std::greater()); - list::iterator pos = nm_locs.begin(); + std::list::iterator pos = nm_locs.begin(); BOOST_FOREACH(const wxString& s, sorted_nms) { include_list->SetItem(*pos, col, s); if (sel_nms.find(s) != sel_nms.end()) @@ -717,10 +715,10 @@ void VarGroupingEditorDlg::OnSortClick( wxCommandEvent& event ) wxLogMessage("In VarGroupingEditorDlg::OnSortClick"); if (!all_init) return; - list all_str = GetListAllStrs(include_list, 1); - list nm_locs; - vector sorted_nms; - set sel_nms; + std::list all_str = GetListAllStrs(include_list, 1); + std::list nm_locs; + std::vector sorted_nms; + std::set sel_nms; int loc=0; BOOST_FOREACH(const wxString& s, all_str) { if (!s.IsEmpty() && s != GdaConst::placeholder_str) { @@ -735,7 +733,7 @@ void VarGroupingEditorDlg::OnSortClick( wxCommandEvent& event ) } sort(sorted_nms.begin(), sorted_nms.end()); - list::iterator pos = nm_locs.begin(); + std::list::iterator pos = nm_locs.begin(); BOOST_FOREACH(const wxString& s, sorted_nms) { include_list->SetItem(*pos, 1, s); if (sel_nms.find(s) != sel_nms.end()) @@ -782,8 +780,8 @@ void VarGroupingEditorDlg::OnAddToListClick( wxCommandEvent& event ) int sel_cnt = ungrouped_list->GetSelectedItemCount(); if (sel_cnt == 0) return; - list typs = GetListSelStrs(ungrouped_list, 1); - set pool; + std::list typs = GetListSelStrs(ungrouped_list, 1); + std::set pool; BOOST_FOREACH(const wxString& s, typs) pool.insert(s); if (pool.size() != 1) return; @@ -812,7 +810,7 @@ void VarGroupingEditorDlg::OnAddToListClick( wxCommandEvent& event ) overwrite_plhdr = true; } - list inc_list_sel = GetListSel(include_list); + std::list inc_list_sel = GetListSel(include_list); int last_inc_list_sel = 0; if (inc_list_sel.size() > 0) last_inc_list_sel = inc_list_sel.back(); @@ -846,7 +844,7 @@ void VarGroupingEditorDlg::OnAddToListClick( wxCommandEvent& event ) } } - list ung_sel_strs = GetListSelStrs(ungrouped_list, 0); + std::list ung_sel_strs = GetListSelStrs(ungrouped_list, 0); int insert_pos = 0; if (!fill_from_top) insert_pos = last_inc_list_sel; @@ -860,9 +858,9 @@ void VarGroupingEditorDlg::OnAddToListClick( wxCommandEvent& event ) } // Remove added items from ungrouped_list - set add_nms; + std::set add_nms; BOOST_FOREACH(const wxString& s, ung_sel_strs) add_nms.insert(s); - list inc_nms; + std::list inc_nms; inc_nms = GetListAllStrs(include_list, 1); BOOST_FOREACH(const wxString& s, inc_nms) add_nms.insert(s); @@ -872,7 +870,7 @@ void VarGroupingEditorDlg::OnAddToListClick( wxCommandEvent& event ) UpdateTimeStepsTxt(); if (new_group_name_txt_ctrl->GetValue().IsEmpty() || inc_list_cnt > 1) { - vector names(inc_list_cnt); + std::vector names(inc_list_cnt); for (int i=0; iGetItemText(i, 1); } @@ -949,8 +947,8 @@ void VarGroupingEditorDlg::includeListDeleteTime() } } - list inc_strs = GetListAllStrs(include_list, 1); - set excl; + std::list inc_strs = GetListAllStrs(include_list, 1); + std::set excl; BOOST_FOREACH(const wxString& s, inc_strs) if (s!="") excl.insert(s); InitUngroupedList(excl); @@ -959,7 +957,7 @@ void VarGroupingEditorDlg::includeListDeleteTime() void VarGroupingEditorDlg::OnIncludeListDblClicked( wxMouseEvent& event) { - list inc_sel_pos = GetListSel(include_list); + std::list inc_sel_pos = GetListSel(include_list); BOOST_FOREACH(int i, inc_sel_pos) { include_list->EditLabel(i); break; @@ -995,7 +993,7 @@ void VarGroupingEditorDlg::OnRemoveFrListClick( wxCommandEvent& event ) wxLogMessage("In VarGroupingEditorDlg::OnRemoveFrListClick"); if (!all_init) return; - list inc_sel_pos = GetListSel(include_list); + std::list inc_sel_pos = GetListSel(include_list); BOOST_FOREACH(int i, inc_sel_pos) { include_list->SetItem(i, 1, ""); include_list->SetItemState(i, 1, wxLIST_STATE_SELECTED); @@ -1014,8 +1012,8 @@ void VarGroupingEditorDlg::OnRemoveFrListClick( wxCommandEvent& event ) } } - list inc_strs = GetListAllStrs(include_list, 1); - set excl; + std::list inc_strs = GetListAllStrs(include_list, 1); + std::set excl; BOOST_FOREACH(const wxString& s, inc_strs) if (s!="") excl.insert(s); InitUngroupedList(excl); @@ -1174,11 +1172,10 @@ void VarGroupingEditorDlg::UpdateAddToListButton() void VarGroupingEditorDlg::UpdateButtons() { - using namespace std; - list sel_strs = GetListSelStrs(include_list, 1); + std::list sel_strs = GetListSelStrs(include_list, 1); int non_empty_cnt = 0; BOOST_FOREACH(const wxString& s, sel_strs) if (s != "") ++non_empty_cnt; - list sel_pos = GetListSel(include_list); + std::list sel_pos = GetListSel(include_list); int sel_first = -1; int sel_last = -1; if (sel_pos.size() > 0) { diff --git a/DialogTools/VariableSettingsDlg.cpp b/DialogTools/VariableSettingsDlg.cpp index 24c9f6389..34a2fdccc 100644 --- a/DialogTools/VariableSettingsDlg.cpp +++ b/DialogTools/VariableSettingsDlg.cpp @@ -517,7 +517,7 @@ wxString UniqueValuesSettingDlg::PrintResult(const std::vector& t.add(std::to_string(jcr[i].totalNeighbors)); t.add(std::to_string(jcr[i].totalJoinCount)); - stringstream ss; + std::stringstream ss; ss.str(""); ss << jcr[i].ratio; t.add(ss.str()); @@ -531,13 +531,13 @@ wxString UniqueValuesSettingDlg::PrintResult(const std::vector& t.add(std::to_string(all.totalNeighbors)); t.add(std::to_string(all.totalJoinCount)); - stringstream ss; + std::stringstream ss; ss.str(""); ss << all.ratio; t.add(ss.str()); t.endOfRow(); - stringstream ss1; + std::stringstream ss1; ss1 << t; txt << ss1.str(); txt << "\n"; @@ -811,7 +811,7 @@ wxString ValidationSettingDlg::PrintResult(const std::vector& jc t.add(GenUtils::DblToStr(frag.simpson, 4).ToStdString()); t.add(GenUtils::DblToStr(frag.std_simpson, 4).ToStdString()); t.endOfRow(); - stringstream ss1; + std::stringstream ss1; ss1 << t; txt << ss1.str(); txt << "\n"; @@ -848,7 +848,7 @@ wxString ValidationSettingDlg::PrintResult(const std::vector& jc t.add(GenUtils::DblToStr(frags[i].mean_cluster_size, 4).ToStdString()); t.endOfRow(); } - stringstream ss1; + std::stringstream ss1; ss1 << t; txt << ss1.str(); txt << "\n"; @@ -881,7 +881,7 @@ wxString ValidationSettingDlg::PrintResult(const std::vector& jc t.add(GenUtils::DblToStr(all.ratio, 4).ToStdString()); t.endOfRow(); - stringstream ss1; + std::stringstream ss1; ss1 << t; txt << ss1.str(); txt << "\n"; @@ -904,7 +904,7 @@ wxString ValidationSettingDlg::PrintResult(const std::vector& jc t.add(std::to_string(comps[i].isoperimeter_quotient)); t.endOfRow(); } - stringstream ss1; + std::stringstream ss1; ss1 << t; txt << ss1.str(); txt << "\n"; @@ -925,7 +925,7 @@ wxString ValidationSettingDlg::PrintResult(const std::vector& jc t.add(std::to_string(diams[i].ratio)); t.endOfRow(); } - stringstream ss1; + std::stringstream ss1; ss1 << t; txt << ss1.str(); txt << "\n"; diff --git a/DialogTools/nbrMatchDlg.cpp b/DialogTools/nbrMatchDlg.cpp index e887007f5..adedc6b91 100644 --- a/DialogTools/nbrMatchDlg.cpp +++ b/DialogTools/nbrMatchDlg.cpp @@ -504,7 +504,7 @@ LocalMatchMapCanvas::LocalMatchMapCanvas(wxWindow *parent, TemplateFrame* t_fram const std::vector& pval, boost::uuids::uuid weights_id, const wxPoint& pos, const wxSize& size) -:MapCanvas(parent, t_frame, project, vector(0), vector(0), CatClassification::no_theme, no_smoothing, 1, weights_id, pos, size), +:MapCanvas(parent, t_frame, project, std::vector(0), std::vector(0), CatClassification::no_theme, no_smoothing, 1, weights_id, pos, size), groups(groups), pval(pval) { wxLogMessage("Entering LocalMatchMapCanvas::LocalMatchMapCanvas"); diff --git a/DialogTools/quantileLisaDlg.cpp b/DialogTools/quantileLisaDlg.cpp index 0a00931e0..84505dd0a 100644 --- a/DialogTools/quantileLisaDlg.cpp +++ b/DialogTools/quantileLisaDlg.cpp @@ -284,7 +284,7 @@ void QuantileLisaDlg::OnOK(wxCommandEvent& event ) } if (new_col > 0) { - vector clusters_undef(rows, false); + std::vector clusters_undef(rows, false); table_int->SetColData(new_col, time, bin_data); table_int->SetColUndefined(col, time, clusters_undef); } diff --git a/Explore/AbstractClusterMap.cpp b/Explore/AbstractClusterMap.cpp index 65fc898cf..b8795c2b7 100644 --- a/Explore/AbstractClusterMap.cpp +++ b/Explore/AbstractClusterMap.cpp @@ -48,8 +48,6 @@ BEGIN_EVENT_TABLE(AbstractMapCanvas, MapCanvas) EVT_MOUSE_CAPTURE_LOST(TemplateCanvas::OnMouseCaptureLostEvent) END_EVENT_TABLE() -using namespace std; - AbstractMapCanvas::AbstractMapCanvas(wxWindow *parent, TemplateFrame* t_frame, Project* project, AbstractCoordinator* a_coordinator, @@ -57,7 +55,7 @@ AbstractMapCanvas::AbstractMapCanvas(wxWindow *parent, TemplateFrame* t_frame, bool is_clust_s, const wxPoint& pos, const wxSize& size) :MapCanvas(parent, t_frame, project, - vector(0), vector(0), + std::vector(0), std::vector(0), CatClassification::no_theme, no_smoothing, 1, boost::uuids::nil_uuid(), pos, size), a_coord(a_coordinator), diff --git a/Explore/Basemap.cpp b/Explore/Basemap.cpp index 24bd52ee6..a40d29b06 100644 --- a/Explore/Basemap.cpp +++ b/Explore/Basemap.cpp @@ -47,7 +47,6 @@ #include "../ShapeOperations/OGRDataAdapter.h" #include "Basemap.h" -using namespace std; using namespace Gda; BasemapItem Gda::GetBasemapSelection(int idx, wxString basemap_sources) @@ -59,7 +58,7 @@ BasemapItem Gda::GetBasemapSelection(int idx, wxString basemap_sources) if (encoded_str.IsEmpty() == false) { basemap_sources = encoded_str; } - vector keys; + std::vector keys; wxString newline; if (basemap_sources.Find("\r\n") != wxNOT_FOUND) { newline = "\r\n"; @@ -96,15 +95,15 @@ BasemapItem Gda::GetBasemapSelection(int idx, wxString basemap_sources) return basemap_item; } -vector Gda::ExtractBasemapResources(wxString basemap_sources) { - vector group_names; - map group_dict; +std::vector Gda::ExtractBasemapResources(wxString basemap_sources) { + std::vector group_names; + std::map group_dict; wxString encoded_str= wxString::FromUTF8((const char*)basemap_sources.mb_str()); if (encoded_str.IsEmpty() == false) { basemap_sources = encoded_str; } - vector keys; + std::vector keys; wxString newline; if (basemap_sources.Find("\r\n") != wxNOT_FOUND) { newline = "\r\n"; @@ -143,7 +142,7 @@ vector Gda::ExtractBasemapResources(wxString basemap_sources) { } } } - vector groups; + std::vector groups; for (int i=0; i nokia_user = OGRDataAdapter::GetInstance().GetHistory("nokia_user"); + std::vector nokia_user = OGRDataAdapter::GetInstance().GetHistory("nokia_user"); if (!nokia_user.empty()) { wxString user = nokia_user[0]; if (!user.empty()) { @@ -259,7 +258,7 @@ void Basemap::SetupMapType(BasemapItem& _basemap_item) } } - vector nokia_key = OGRDataAdapter::GetInstance().GetHistory("nokia_key"); + std::vector nokia_key = OGRDataAdapter::GetInstance().GetHistory("nokia_key"); if (!nokia_key.empty()) { wxString key = nokia_key[0]; if (!key.empty()) { @@ -439,7 +438,7 @@ int Basemap::GetOptimalZoomLevel(double paddingFactor) double zoomFactorPowered = viewHeightHalf / (40.7436654315252*(vy1-vy0)); double resolutionVertical = 360.0 / (zoomFactorPowered * 256); - double resolution = max(resolutionHorizontal, resolutionVertical) * paddingFactor; + double resolution = std::max(resolutionHorizontal, resolutionVertical) * paddingFactor; zoom = log2(360.0 / (resolution * 256)); @@ -455,7 +454,7 @@ int Basemap::GetEasyZoomLevel() double zoomV = (int)ceil(log2(degreeRatio * screen->height / 256.0)); if (zoomH > 0 && zoomV > 0) { - zoom = min(zoomH, zoomV); + zoom = std::min(zoomH, zoomV); } else { if (zoomH > 0) zoom = zoomH; diff --git a/Explore/Basemap.h b/Explore/Basemap.h index a529b7b9d..e5cf9e980 100644 --- a/Explore/Basemap.h +++ b/Explore/Basemap.h @@ -30,11 +30,7 @@ #include "../Algorithms/threadpool.h" -using namespace std; - namespace Gda { - - /** * BasemapItem is for "Basemap Source Configuration" dialog * Each basemap source can be represented in the form of: @@ -102,7 +98,7 @@ namespace Gda { items.push_back(item); } wxString name; - vector items; + std::vector items; }; // Return an instance of BasemapItem based on the basemap_source, which is @@ -112,7 +108,7 @@ namespace Gda { // Construct a std::vector of BasemapGroup (which is a collection of // BasemapItems) using basemap_sources (e.g. GdaConst::gda_basemap_sources // or the value in "Basemap Sources:" TextCtrl in Basemap Configuration Dialog - vector ExtractBasemapResources(wxString basemap_sources) ; + std::vector ExtractBasemapResources(wxString basemap_sources) ; // inline function return separator for local file path inline char separator() { diff --git a/Explore/CartogramNewView.cpp b/Explore/CartogramNewView.cpp index 463bc9357..a6e74ae22 100644 --- a/Explore/CartogramNewView.cpp +++ b/Explore/CartogramNewView.cpp @@ -43,13 +43,11 @@ #include "CartogramNewView.h" #include "MapLayoutView.h" -using namespace std; - DorlingCartWorkerThread::DorlingCartWorkerThread(int iters_s, DorlingCartogram* cart_s, wxMutex* worker_list_mutex_s, wxCondition* worker_list_empty_cond_s, - list *worker_list_s, + std::list *worker_list_s, int thread_id_s) : wxThread(), iters(iters_s), cart(cart_s), @@ -97,8 +95,8 @@ CartogramNewCanvas:: CartogramNewCanvas(wxWindow *parent, TemplateFrame* t_frame, Project* project_s, - const vector& v_info, - const vector& col_ids, + const std::vector& v_info, + const std::vector& col_ids, const wxPoint& pos, const wxSize& size) :TemplateCanvas(parent, t_frame, project_s, project_s->GetHighlightState(), pos, size, true, true), @@ -137,8 +135,8 @@ improve_table(6), realtime_updates(false), all_init(false) } } - vector orig_x(num_obs); - vector orig_y(num_obs); + std::vector orig_x(num_obs); + std::vector orig_y(num_obs); project->GetCentroids(orig_x, orig_y); cart_nbr_info = new CartNbrInfo(project->GetVoronoiRookNeighborGal(), @@ -148,7 +146,7 @@ improve_table(6), realtime_updates(false), all_init(false) carts.resize(num_cart_times); num_improvement_iters.resize(num_cart_times); - vector> orig_data(num_cart_times); + std::vector> orig_data(num_cart_times); for (int t=0; t txt(6); + std::vector txt(6); for (size_t i=0; i undefs(num_obs, false); + std::vector undefs(num_obs, false); for (size_t i=0; i temp_cat_labels; // will be ignored + std::vector temp_cat_labels; // will be ignored CatClassification::SetBreakPoints(cat_classif_def.breaks, temp_cat_labels, cat_var_sorted[tht], @@ -843,7 +841,7 @@ void CartogramNewCanvas::ImproveAll(double max_seconds, int max_iters) // List of all the threads currently alive. As soon as the // thread terminates, it removes itself from the list. - list worker_list; + std::list worker_list; int thread_id = 0; for (int t=crt_min_tm; t::iterator it; + std::list::iterator it; for (it = worker_list.begin(); it != worker_list.end(); it++) { (*it)->Run(); } @@ -995,8 +993,8 @@ BEGIN_EVENT_TABLE(CartogramNewFrame, TemplateFrame) END_EVENT_TABLE() CartogramNewFrame::CartogramNewFrame(wxFrame *parent, Project* project, - const vector& var_info, - const vector& col_ids, + const std::vector& var_info, + const std::vector& col_ids, const wxString& title, const wxPoint& pos, const wxSize& size, const long style) : TemplateFrame(parent, project, title, pos, size, style) diff --git a/Explore/CatClassification.cpp b/Explore/CatClassification.cpp index 2ad342472..b8dbf7668 100644 --- a/Explore/CatClassification.cpp +++ b/Explore/CatClassification.cpp @@ -34,8 +34,6 @@ #include "../GdaConst.h" #include "CatClassification.h" -using namespace std; - struct UniqueValElem { UniqueValElem(double v, int f, int l): val(v), first(f), last(l) {} double val; // value @@ -129,7 +127,7 @@ void CatClassification::CatLabelsFromBreaks(const std::vector& breaks, bool useScientificNotation, int cat_disp_precision) { - stringstream s; + std::stringstream s; if (useScientificNotation) s << std::setprecision(cat_disp_precision) << std::scientific; else s << std::setprecision(cat_disp_precision) << std::fixed; @@ -303,7 +301,7 @@ void CatClassification::SetBreakPoints(std::vector& breaks, FindNaturalBreaks(num_cats, var, var_undef, breaks); // Get labels cat_labels.resize(num_cats); - stringstream s; + std::stringstream s; if (useScientificNotation) s << std::setprecision(cat_disp_precision) << std::scientific; else @@ -593,7 +591,7 @@ PopulateCatClassifData(const CatClassifDef& cat_def, return; } - stringstream ss; + std::stringstream ss; if (useSciNotation) ss << std::setprecision(cat_disp_precision) << std::scientific; else @@ -1990,7 +1988,7 @@ SetNaturalBreaksCats(int num_cats, if (undef_cnts_tms[t]>0) cat_data.AppendUndefCategory(t, undef_cnts_tms[t]); - stringstream s; + std::stringstream s; if (useSciNotation) s << std::setprecision(cat_disp_precision) << std::scientific; diff --git a/Explore/ClusterMatchMapView.cpp b/Explore/ClusterMatchMapView.cpp index 791c96b5e..206e6ce71 100644 --- a/Explore/ClusterMatchMapView.cpp +++ b/Explore/ClusterMatchMapView.cpp @@ -49,8 +49,6 @@ #include "MapNewView.h" #include "ClusterMatchMapView.h" -using namespace std; - BEGIN_EVENT_TABLE( ClusterMatchSelectDlg, wxDialog ) EVT_CLOSE( ClusterMatchSelectDlg::OnClose ) END_EVENT_TABLE() @@ -589,8 +587,8 @@ BEGIN_EVENT_TABLE(ClusterMatchMapCanvas, MapCanvas) END_EVENT_TABLE() ClusterMatchMapCanvas::ClusterMatchMapCanvas(wxWindow *parent, TemplateFrame *t_frame, Project *project, const std::vector& cat_values, const std::map& cat_value_flags, const wxPoint &pos, const wxSize &size) -: MapCanvas(parent, t_frame, project, vector(0), - vector(0), CatClassification::no_theme, +: MapCanvas(parent, t_frame, project, std::vector(0), + std::vector(0), CatClassification::no_theme, no_smoothing, 1, boost::uuids::nil_uuid(), pos, size) { // get categories num_obs = (int)cat_values.size(); diff --git a/Explore/ClusterMatchMapView.h b/Explore/ClusterMatchMapView.h index 210fba611..a37607f89 100644 --- a/Explore/ClusterMatchMapView.h +++ b/Explore/ClusterMatchMapView.h @@ -27,8 +27,6 @@ #include "MapNewView.h" #include "../GdaConst.h" -using namespace std; - class ClusterMatchSelectDlg : public AbstractClusterDlg { public: diff --git a/Explore/ColocationMapView.cpp b/Explore/ColocationMapView.cpp index ac68970de..e65bed1a1 100644 --- a/Explore/ColocationMapView.cpp +++ b/Explore/ColocationMapView.cpp @@ -45,8 +45,6 @@ #include "MapNewView.h" #include "ColocationMapView.h" -using namespace std; - BEGIN_EVENT_TABLE( ColocationSelectDlg, wxDialog ) EVT_CLOSE( ColocationSelectDlg::OnClose ) END_EVENT_TABLE() @@ -307,7 +305,7 @@ void ColocationSelectDlg::OnVarSelect( wxCommandEvent& event) clear_colo_control(); - vector tms; + std::vector tms; combo_var->GetSelections(var_selections); size_t num_var = var_selections.size(); @@ -348,8 +346,8 @@ void ColocationSelectDlg::OnVarSelect( wxCommandEvent& event) table_int->GetColUndefined(col_ids[i], data_undef[i]); } - vector > same_val_counts(rows); - vector same_undef(rows, false); + std::vector > same_val_counts(rows); + std::vector same_undef(rows, false); for (int i=0; i sel_vals; - vector sel_clrs; - vector sel_lbls; - vector > sel_ids; + std::vector sel_vals; + std::vector sel_clrs; + std::vector sel_lbls; + std::vector > sel_ids; for (int i=0; i& _select_vars,vector& _co_vals, vector& _co_clrs, vector& _co_lbls, vector >& _co_ids, CatClassification::CatClassifType theme_type_s, boost::uuids::uuid weights_id_s, const wxPoint& pos, const wxSize& size) -:MapCanvas(parent, t_frame, project, vector(0), vector(0), CatClassification::no_theme, no_smoothing, 1, weights_id_s, pos, size), +ColocationMapCanvas::ColocationMapCanvas(wxWindow *parent, TemplateFrame* t_frame, Project* project, std::vector& _select_vars,std::vector& _co_vals, std::vector& _co_clrs, std::vector& _co_lbls, std::vector >& _co_ids, CatClassification::CatClassifType theme_type_s, boost::uuids::uuid weights_id_s, const wxPoint& pos, const wxSize& size) +:MapCanvas(parent, t_frame, project, std::vector(0), std::vector(0), CatClassification::no_theme, no_smoothing, 1, weights_id_s, pos, size), select_vars(_select_vars), co_vals(_co_vals), co_clrs(_co_clrs), co_ids(_co_ids), co_lbls(_co_lbls) { wxLogMessage("Entering ColocationMapCanvas::ColocationMapCanvas"); @@ -649,7 +647,7 @@ void ColocationMapCanvas::CreateAndUpdateCategories() cat_data.CreateCategoriesAtCanvasTm(num_cats, t); - map sig_dict; + std::map sig_dict; for (int i=0; i& select_vars, vector& co_vals, vector& co_clrs, vector& co_lbls, vector >& co_ids, boost::uuids::uuid weights_id_s, const wxString title, const wxPoint& pos, const wxSize& size, const long style) +ColocationMapFrame::ColocationMapFrame(wxFrame *parent, Project* project, std::vector& select_vars, std::vector& co_vals, std::vector& co_clrs, std::vector& co_lbls, std::vector >& co_ids, boost::uuids::uuid weights_id_s, const wxString title, const wxPoint& pos, const wxSize& size, const long style) : MapFrame(parent, project, pos, size, style) { wxLogMessage("Entering ColocationMapFrame::ColocationMapFrame"); diff --git a/Explore/ColocationMapView.h b/Explore/ColocationMapView.h index 5a65cda16..428133c56 100644 --- a/Explore/ColocationMapView.h +++ b/Explore/ColocationMapView.h @@ -24,8 +24,6 @@ #include "MapNewView.h" #include "../GdaConst.h" -using namespace std; - class ColocationSelectDlg : public AbstractClusterDlg { public: @@ -89,11 +87,11 @@ class ColocationMapCanvas : public MapCanvas ColocationMapCanvas(wxWindow *parent, TemplateFrame* t_frame, Project* project, - vector& select_vars, - vector& co_vals, - vector& co_clrs, - vector& co_lbls, - vector >& co_ids, + std::vector& select_vars, + std::vector& co_vals, + std::vector& co_clrs, + std::vector& co_lbls, + std::vector >& co_ids, CatClassification::CatClassifType theme_type, boost::uuids::uuid weights_id_s, const wxPoint& pos = wxDefaultPosition, @@ -111,11 +109,11 @@ class ColocationMapCanvas : public MapCanvas virtual void TimeSyncVariableToggle(int var_index); virtual void UpdateStatusBar(); - vector select_vars; - vector co_vals; - vector co_clrs; - vector co_lbls; - vector > co_ids; + std::vector select_vars; + std::vector co_vals; + std::vector co_clrs; + std::vector co_lbls; + std::vector > co_ids; DECLARE_EVENT_TABLE() }; @@ -127,11 +125,11 @@ class ColocationMapFrame : public MapFrame public: ColocationMapFrame(wxFrame *parent, Project* project, - vector& select_vars, - vector& co_vals, - vector& co_clrs, - vector& co_lbls, - vector >& co_ids, + std::vector& select_vars, + std::vector& co_vals, + std::vector& co_clrs, + std::vector& co_lbls, + std::vector >& co_ids, boost::uuids::uuid weights_id_s, const wxString title, const wxPoint& pos = wxDefaultPosition, diff --git a/Explore/ConditionalClusterMapView.cpp b/Explore/ConditionalClusterMapView.cpp index 691e5af76..244147bd2 100644 --- a/Explore/ConditionalClusterMapView.cpp +++ b/Explore/ConditionalClusterMapView.cpp @@ -45,8 +45,6 @@ #include "MLJCCoordinator.h" #include "ConditionalClusterMapView.h" -using namespace std; - IMPLEMENT_CLASS(ConditionalClusterMapCanvas, ConditionalNewCanvas) BEGIN_EVENT_TABLE(ConditionalClusterMapCanvas, ConditionalNewCanvas) EVT_PAINT(TemplateCanvas::OnPaint) @@ -61,8 +59,8 @@ ConditionalClusterMapCanvas:: ConditionalClusterMapCanvas(wxWindow *parent, TemplateFrame* t_frame, Project* project_s, - const vector& v_info, - const vector& col_ids, + const std::vector& v_info, + const std::vector& col_ids, const wxString& ttl, const wxPoint& pos, const wxSize& size) : ConditionalNewCanvas(parent, t_frame, project_s, v_info, col_ids, @@ -219,7 +217,7 @@ void ConditionalClusterMapCanvas::OnSaveCategories() wxString title; title << "Save " << label; - vector undefs(num_obs, false); + std::vector undefs(num_obs, false); for (size_t i=0; i v_brk_ref(n_rows); - vector h_brk_ref(n_cols); + std::vector v_brk_ref(n_rows); + std::vector h_brk_ref(n_cols); for (int row=0; row& var_info, - const vector& col_ids, + const std::vector& var_info, + const std::vector& col_ids, LisaCoordinator* lisa_coord, const wxString& title, const wxPoint& pos, const wxSize& size, const long style) @@ -746,8 +744,8 @@ ConditionalClusterMapFrame(wxFrame *parent, Project* project, ConditionalClusterMapFrame:: ConditionalClusterMapFrame(wxFrame *parent, Project* project, - const vector& var_info, - const vector& col_ids, + const std::vector& var_info, + const std::vector& col_ids, GStatCoordinator* g_coord, bool is_gi, bool is_perm, const wxString& title, const wxPoint& pos, @@ -800,8 +798,8 @@ ConditionalClusterMapFrame(wxFrame *parent, Project* project, ConditionalClusterMapFrame:: ConditionalClusterMapFrame(wxFrame *parent, Project* project, - const vector& var_info, - const vector& col_ids, + const std::vector& var_info, + const std::vector& col_ids, LocalGearyCoordinator* local_geary_coord, const wxString& title, const wxPoint& pos, const wxSize& size, const long style) @@ -852,8 +850,8 @@ ConditionalClusterMapFrame(wxFrame *parent, Project* project, ConditionalClusterMapFrame:: ConditionalClusterMapFrame(wxFrame *parent, Project* project, - const vector& var_info, - const vector& col_ids, + const std::vector& var_info, + const std::vector& col_ids, JCCoordinator* local_jc_coord, const wxString& title, const wxPoint& pos, const wxSize& size, const long style) @@ -1046,8 +1044,8 @@ void ConditionalClusterMapFrame::ChangeThemeType( ConditionalLISAClusterMapCanvas:: ConditionalLISAClusterMapCanvas(wxWindow *parent, TemplateFrame* t_frame, Project* project, - const vector& var_info, - const vector& col_ids, + const std::vector& var_info, + const std::vector& col_ids, LisaCoordinator* lisa_coordinator, const wxString& title, const wxPoint& pos, @@ -1214,7 +1212,7 @@ void ConditionalLISAClusterMapCanvas::UpdateStatusBar() //int t = var_info[CAT_VAR].time; int t = 0; - const vector& hl = highlight_state->GetHighlight(); + const std::vector& hl = highlight_state->GetHighlight(); wxString s; if (highlight_state->GetTotalHighlighted()> 0) { int n_total_hl = highlight_state->GetTotalHighlighted(); @@ -1261,8 +1259,8 @@ void ConditionalLISAClusterMapCanvas::UpdateStatusBar() ConditionalGClusterMapCanvas:: ConditionalGClusterMapCanvas(wxWindow *parent, TemplateFrame* t_frame, Project* project, - const vector& var_info, - const vector& col_ids, + const std::vector& var_info, + const std::vector& col_ids, GStatCoordinator* g_coordinator, bool is_gi_, bool is_perm_, @@ -1304,7 +1302,7 @@ void ConditionalGClusterMapCanvas::CreateAndUpdateCategories() cat_var_sorted[t].resize(num_obs); cat_var_undef[t].resize(num_obs); - vector cluster; + std::vector cluster; g_coord->FillClusterCats(t, is_gi, is_perm, cluster); for (int i=0; i cluster; + std::vector cluster; g_coord->FillClusterCats(t, is_gi, is_perm, cluster); for (int i=0, iend=g_coord->num_obs; i& hl = highlight_state->GetHighlight(); + const std::vector& hl = highlight_state->GetHighlight(); wxString s; if (highlight_state->GetTotalHighlighted()> 0) { int n_total_hl = highlight_state->GetTotalHighlighted(); @@ -1477,8 +1475,8 @@ void ConditionalGClusterMapCanvas::UpdateStatusBar() ConditionalLocalGearyClusterMapCanvas:: ConditionalLocalGearyClusterMapCanvas(wxWindow *parent, TemplateFrame* t_frame, Project* project, - const vector& var_info, - const vector& col_ids, + const std::vector& var_info, + const std::vector& col_ids, LocalGearyCoordinator* local_geary_coordinator, const wxString& title, const wxPoint& pos, @@ -1647,7 +1645,7 @@ void ConditionalLocalGearyClusterMapCanvas::UpdateStatusBar() //int t = var_info[CAT_VAR].time; int t = 0; - const vector& hl = highlight_state->GetHighlight(); + const std::vector& hl = highlight_state->GetHighlight(); wxString s; if (highlight_state->GetTotalHighlighted()> 0) { int n_total_hl = highlight_state->GetTotalHighlighted(); @@ -1693,8 +1691,8 @@ void ConditionalLocalGearyClusterMapCanvas::UpdateStatusBar() ConditionalLocalJoinCountClusterMapCanvas:: ConditionalLocalJoinCountClusterMapCanvas(wxWindow *parent, TemplateFrame* t_frame, Project* project, - const vector& var_info, - const vector& col_ids, + const std::vector& var_info, + const std::vector& col_ids, JCCoordinator* local_jc_coordinator, const wxString& title, const wxPoint& pos, @@ -1860,7 +1858,7 @@ void ConditionalLocalJoinCountClusterMapCanvas::UpdateStatusBar() //int t = var_info[CAT_VAR].time; int t = 0; - const vector& hl = highlight_state->GetHighlight(); + const std::vector& hl = highlight_state->GetHighlight(); wxString s; if (highlight_state->GetTotalHighlighted()> 0) { int n_total_hl = highlight_state->GetTotalHighlighted(); diff --git a/Explore/ConditionalClusterMapView.h b/Explore/ConditionalClusterMapView.h index 93884975d..45deac0f6 100644 --- a/Explore/ConditionalClusterMapView.h +++ b/Explore/ConditionalClusterMapView.h @@ -24,8 +24,6 @@ #include "../TemplateLegend.h" #include "ConditionalNewView.h" -using namespace std; - class LisaCoordinator; class GStatCoordinator; class LocalGearyCoordinator; @@ -41,8 +39,8 @@ class ConditionalClusterMapCanvas : public ConditionalNewCanvas { ConditionalClusterMapCanvas(wxWindow *parent, TemplateFrame* t_frame, Project* project, - const vector& var_info, - const vector& col_ids, + const std::vector& var_info, + const std::vector& col_ids, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize); @@ -92,11 +90,11 @@ class ConditionalClusterMapCanvas : public ConditionalNewCanvas { wxString title; CatClassifState* cc_state_map; int num_categories; // current number of categories - vector cat_var_sorted; - vector > cat_var_undef; + std::vector cat_var_sorted; + std::vector > cat_var_undef; - vector map_valid; - vector map_error_message; + std::vector map_valid; + std::vector map_error_message; // background map related: wxBitmap* bin_bm; @@ -122,16 +120,16 @@ class ConditionalClusterMapFrame : public ConditionalNewFrame { DECLARE_CLASS(ConditionalClusterMapFrame) public: ConditionalClusterMapFrame(wxFrame *parent, Project* project, - const vector& var_info, - const vector& col_ids, + const std::vector& var_info, + const std::vector& col_ids, LisaCoordinator* lisa_coord, const wxString& title = _("Conditional LISA Map"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const long style = wxDEFAULT_FRAME_STYLE); ConditionalClusterMapFrame(wxFrame *parent, Project* project, - const vector& var_info, - const vector& col_ids, + const std::vector& var_info, + const std::vector& col_ids, GStatCoordinator* g_coord, bool is_gi, bool is_perm, const wxString& title = _("Conditional GetisOrd Map"), @@ -139,16 +137,16 @@ class ConditionalClusterMapFrame : public ConditionalNewFrame { const wxSize& size = wxDefaultSize, const long style = wxDEFAULT_FRAME_STYLE); ConditionalClusterMapFrame(wxFrame *parent, Project* project, - const vector& var_info, - const vector& col_ids, + const std::vector& var_info, + const std::vector& col_ids, LocalGearyCoordinator* local_geary_coord, const wxString& title = _("Conditional Local Geary Map"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const long style = wxDEFAULT_FRAME_STYLE); ConditionalClusterMapFrame(wxFrame *parent, Project* project, - const vector& var_info, - const vector& col_ids, + const std::vector& var_info, + const std::vector& col_ids, JCCoordinator* local_jc_coord, const wxString& title = _("Conditional Local Join Count Map"), const wxPoint& pos = wxDefaultPosition, @@ -198,8 +196,8 @@ class ConditionalLISAClusterMapCanvas : public ConditionalClusterMapCanvas { ConditionalLISAClusterMapCanvas(wxWindow *parent, TemplateFrame* t_frame, Project* project, - const vector& var_info, - const vector& col_ids, + const std::vector& var_info, + const std::vector& col_ids, LisaCoordinator* lisa_coordinator, const wxString& title, const wxPoint& pos = wxDefaultPosition, @@ -226,8 +224,8 @@ class ConditionalGClusterMapCanvas : public ConditionalClusterMapCanvas { ConditionalGClusterMapCanvas(wxWindow *parent, TemplateFrame* t_frame, Project* project, - const vector& var_info, - const vector& col_ids, + const std::vector& var_info, + const std::vector& col_ids, GStatCoordinator* g_coordinator, bool is_gi, bool is_perm, @@ -257,8 +255,8 @@ class ConditionalLocalGearyClusterMapCanvas : public ConditionalClusterMapCanvas ConditionalLocalGearyClusterMapCanvas(wxWindow *parent, TemplateFrame* t_frame, Project* project, - const vector& var_info, - const vector& col_ids, + const std::vector& var_info, + const std::vector& col_ids, LocalGearyCoordinator* local_geary_coordinator, const wxString& title, const wxPoint& pos = wxDefaultPosition, @@ -285,8 +283,8 @@ class ConditionalLocalJoinCountClusterMapCanvas : public ConditionalClusterMapCa ConditionalLocalJoinCountClusterMapCanvas(wxWindow *parent, TemplateFrame* t_frame, Project* project, - const vector& var_info, - const vector& col_ids, + const std::vector& var_info, + const std::vector& col_ids, JCCoordinator* local_jc_coordinator, const wxString& title, const wxPoint& pos = wxDefaultPosition, diff --git a/Explore/ConditionalHistogramView.cpp b/Explore/ConditionalHistogramView.cpp index 005360969..d8e5ac139 100644 --- a/Explore/ConditionalHistogramView.cpp +++ b/Explore/ConditionalHistogramView.cpp @@ -385,8 +385,8 @@ void ConditionalHistogramCanvas::ResizeSelectableShps(int virtual_scrn_w, double bg_ymax = scn_h-marg_top; int n_rows = is_vert_number ? vert_num_cats-1 : vert_num_cats; int n_cols = is_horz_number ? horiz_num_cats-1 : horiz_num_cats; - vector v_brk_ref(n_rows); - vector h_brk_ref(n_cols); + std::vector v_brk_ref(n_rows); + std::vector h_brk_ref(n_cols); for (int row=0; row& v_info, - const vector& col_ids, + const std::vector& v_info, + const std::vector& col_ids, const wxPoint& pos, const wxSize& size) : ConditionalNewCanvas(parent, t_frame, project_s, v_info, col_ids, true, true, pos, size), @@ -139,9 +137,9 @@ void ConditionalMapCanvas::AppendCustomCategories(wxMenu* menu, CatClassifManage { // search for ID_CAT_CLASSIF_A(B,C)_MENU submenus const int num_sub_menus=3; - vector menu_id(num_sub_menus); - vector sub_menu_id(num_sub_menus); - vector base_id(num_sub_menus); + std::vector menu_id(num_sub_menus); + std::vector sub_menu_id(num_sub_menus); + std::vector base_id(num_sub_menus); menu_id[0] = XRCID("ID_NEW_CUSTOM_CAT_CLASSIF_A"); menu_id[1] = XRCID("ID_NEW_CUSTOM_CAT_CLASSIF_B"); // conditional horizontal menu menu_id[2] = XRCID("ID_NEW_CUSTOM_CAT_CLASSIF_C"); // conditional verticle menu @@ -171,7 +169,7 @@ void ConditionalMapCanvas::AppendCustomCategories(wxMenu* menu, CatClassifManage _("Create new custom categories classification.")); sm->AppendSeparator(); - vector titles; + std::vector titles; ccm->GetTitles(titles); for (size_t j=0; jAppend(base_id[i]+j, titles[j]); @@ -209,7 +207,7 @@ void ConditionalMapCanvas::OnCustomCategoryClick(wxCommandEvent& event) int xrc_id = event.GetId(); CatClassifManager* ccm = project->GetCatClassifManager(); if (!ccm) return; - vector titles; + std::vector titles; ccm->GetTitles(titles); int idx = xrc_id - GdaConst::ID_CUSTOM_CAT_CLASSIF_CHOICE_A0; if (idx < 0 || idx >= titles.size()) return; @@ -318,7 +316,7 @@ void ConditionalMapCanvas::OnSaveCategories() wxString title; title << "Save " << label; - vector undefs(num_obs, false); + std::vector undefs(num_obs, false); for (size_t i=0; i temp_cat_labels; // will be ignored + std::vector temp_cat_labels; // will be ignored CatClassification::SetBreakPoints(cat_classif_def_map.breaks, temp_cat_labels, cat_var_sorted[var_info[CAT_VAR].time], @@ -593,8 +591,8 @@ void ConditionalMapCanvas::ResizeSelectableShps(int virtual_scrn_w, double bg_ymax = scn_h-marg_top; int n_rows = is_vert_number ? vert_num_cats-1 : vert_num_cats; int n_cols = is_horz_number ? horiz_num_cats-1 : horiz_num_cats; - vector v_brk_ref(n_rows); - vector h_brk_ref(n_cols); + std::vector v_brk_ref(n_rows); + std::vector h_brk_ref(n_cols); for (int row=0; row& hl = highlight_state->GetHighlight(); + const std::vector& hl = highlight_state->GetHighlight(); wxString s; if (highlight_state->GetTotalHighlighted()> 0) { int n_total_hl = highlight_state->GetTotalHighlighted(); @@ -987,7 +985,7 @@ BEGIN_EVENT_TABLE(ConditionalMapFrame, ConditionalNewFrame) EVT_ACTIVATE(ConditionalMapFrame::OnActivate) END_EVENT_TABLE() -ConditionalMapFrame::ConditionalMapFrame(wxFrame *parent, Project* project, const vector& var_info, const vector& col_ids, const wxString& title, const wxPoint& pos, const wxSize& size, const long style) +ConditionalMapFrame::ConditionalMapFrame(wxFrame *parent, Project* project, const std::vector& var_info, const std::vector& col_ids, const wxString& title, const wxPoint& pos, const wxSize& size, const long style) : ConditionalNewFrame(parent, project, var_info, col_ids, title, pos, size, style) { diff --git a/Explore/ConditionalMapView.h b/Explore/ConditionalMapView.h index 4da7fe509..0c4cb2533 100644 --- a/Explore/ConditionalMapView.h +++ b/Explore/ConditionalMapView.h @@ -24,8 +24,6 @@ #include "../TemplateLegend.h" #include "ConditionalNewView.h" -using namespace std; - class ConditionalMapFrame; class ConditionalMapCanvas; class ConditionalMapLegend; @@ -37,8 +35,8 @@ class ConditionalMapCanvas : public ConditionalNewCanvas { ConditionalMapCanvas(wxWindow *parent, TemplateFrame* t_frame, Project* project, - const vector& var_info, - const vector& col_ids, + const std::vector& var_info, + const std::vector& col_ids, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize); @@ -85,11 +83,11 @@ class ConditionalMapCanvas : public ConditionalNewCanvas { protected: CatClassifState* cc_state_map; int num_categories; // current number of categories - vector cat_var_sorted; - vector > cat_var_undef; + std::vector cat_var_sorted; + std::vector > cat_var_undef; - vector map_valid; - vector map_error_message; + std::vector map_valid; + std::vector map_error_message; // background map related: wxBitmap* bin_bm; @@ -113,8 +111,8 @@ class ConditionalMapFrame : public ConditionalNewFrame { DECLARE_CLASS(ConditionalMapFrame) public: ConditionalMapFrame(wxFrame *parent, Project* project, - const vector& var_info, - const vector& col_ids, + const std::vector& var_info, + const std::vector& col_ids, const wxString& title = _("Conditional Map"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, diff --git a/Explore/ConditionalNewView.cpp b/Explore/ConditionalNewView.cpp index 03c3cc07b..43efca36c 100644 --- a/Explore/ConditionalNewView.cpp +++ b/Explore/ConditionalNewView.cpp @@ -237,7 +237,7 @@ void ConditionalNewCanvas::SetCheckMarks(wxMenu* menu) // view in the xrc file. Items that cannot be enable/disabled, // or are not checkable do not appear. CatClassifManager* ccm = project->GetCatClassifManager(); - vector titles; + std::vector titles; ccm->GetTitles(titles); GeneralWxUtils::CheckMenuItem(menu, XRCID("ID_COND_VERT_THEMELESS"), diff --git a/Explore/CorrelParamsDlg.cpp b/Explore/CorrelParamsDlg.cpp index 0c87304a1..2724da37f 100644 --- a/Explore/CorrelParamsDlg.cpp +++ b/Explore/CorrelParamsDlg.cpp @@ -478,8 +478,8 @@ void CorrelParamsFrame::OnApplyBtn(wxCommandEvent& ev) var_man.SetCurTime(0,v1_time); double mean = 0; double var = 0; - vector vals; - vector vals_undef; + std::vector vals; + std::vector vals_undef; table_int->GetColData(col_id, v1_time, vals); table_int->GetColUndefined(col_id, v1_time, vals_undef); CorrelogramAlgs::GetSampMeanAndVar(vals, vals_undef, mean, var); diff --git a/Explore/CorrelogramAlgs.cpp b/Explore/CorrelogramAlgs.cpp index 5111d216f..3e7b1a7da 100644 --- a/Explore/CorrelogramAlgs.cpp +++ b/Explore/CorrelogramAlgs.cpp @@ -72,7 +72,6 @@ bool CorrelogramAlgs::MakeCorrRandSamp(const std::vector& pts, int num_bins, int iters, std::vector& out) { - using namespace std; using namespace GenGeomAlgs; wxLogMessage("Entering CorrelogramAlgs::MakeCorrRandSamp"); wxStopWatch sw; @@ -179,7 +178,6 @@ bool CorrelogramAlgs::MakeCorrAllPairs(const std::vector& pts, std::vector& out) { - using namespace std; using namespace GenGeomAlgs; wxLogMessage("Entering CorrelogramAlgs::MakeCorrAllPairs"); wxStopWatch sw; @@ -204,9 +202,9 @@ bool CorrelogramAlgs::MakeCorrAllPairs(const std::vector& pts, max_d = min_d; size_t pairs = ((nobs-1)*nobs)/2; - vector Zdist(pairs); - vector Zprod(calc_prods ? pairs : 0); - vector Zprod_undef(calc_prods ? pairs : 0); + std::vector Zdist(pairs); + std::vector Zprod(calc_prods ? pairs : 0); + std::vector Zprod_undef(calc_prods ? pairs : 0); size_t pc = 0; for (size_t i=0; i& out) { - using namespace std; using namespace GenGeomAlgs; using namespace SpatialIndAlgs; wxLogMessage("Entering CorrelogramAlgs::MakeCorrThresh (plane)"); @@ -328,7 +325,7 @@ bool CorrelogramAlgs::MakeCorrThresh(const rtree_pt_2d_t& rtree, double x = v.first.get<0>(); double y = v.first.get<1>(); box_2d b(pt_2d(x-thresh, y-thresh), pt_2d(x+thresh, y+thresh)); - vector q; + std::vector q; rtree.query(bgi::intersects(b), std::back_inserter(q)); BOOST_FOREACH(const pt_2d_val& w, q) { const size_t j = w.second; @@ -369,7 +366,6 @@ bool CorrelogramAlgs::MakeCorrThresh(const rtree_pt_3d_t& rtree, double thresh, int num_bins, std::vector& out) { - using namespace std; using namespace GenGeomAlgs; using namespace SpatialIndAlgs; wxLogMessage("Entering CorrelogramAlgs::MakeCorrThresh (sphere)"); @@ -416,7 +412,7 @@ bool CorrelogramAlgs::MakeCorrThresh(const rtree_pt_3d_t& rtree, double z = v.first.get<2>(); box_3d b(pt_3d(x-sec_thresh, y-sec_thresh, z-sec_thresh), pt_3d(x+sec_thresh, y+sec_thresh, z+sec_thresh)); - vector q; + std::vector q; rtree.query(bgi::intersects(b), std::back_inserter(q)); BOOST_FOREACH(const pt_3d_val& w, q) { const size_t j = w.second; diff --git a/Explore/CorrelogramView.cpp b/Explore/CorrelogramView.cpp index 17b3182f0..bcd21b8f4 100644 --- a/Explore/CorrelogramView.cpp +++ b/Explore/CorrelogramView.cpp @@ -220,7 +220,7 @@ void CorrelogramFrame::OnSaveResult(wxCommandEvent& event) wxTextOutputStream txt_out( output_stream ); txt_out << ""; - vector lbls; + std::vector lbls; lbls.push_back(_("Autocorr.")); lbls.push_back(_("Min")); lbls.push_back(_("Max")); @@ -621,7 +621,7 @@ void CorrelogramFrame::SetupPanelForNumVariables(int num_vars) v_axs.tics[i] = v_axs.data_min + d*v_axs.tic_inc; std::stringstream s; // round to nearest whole number for frequency? - s << setprecision(0) << fixed << v_axs.tics[i]; + s << std::setprecision(0) << std::fixed << v_axs.tics[i]; v_axs.tics_str[i] = s.str(); v_axs.tics_str_show[i] = true; } @@ -764,17 +764,17 @@ void CorrelogramFrame::SetupPanelForNumVariables(int num_vars) panel_v_szr->Add(bag_szr, 1, wxALL | wxEXPAND); - vector lbls; + std::vector lbls; lbls.push_back(_("Autocorr.")); lbls.push_back(_("Min")); lbls.push_back(_("Max")); lbls.push_back(_("# Pairs")); - vector > vals; - vector stats; + std::vector > vals; + std::vector stats; int sum_pairs = 0; for (size_t i=0; i sub_vals; + std::vector sub_vals; sub_vals.push_back(cbins[i].corr_avg); sub_vals.push_back(cbins[i].dist_min); sub_vals.push_back(cbins[i].dist_max); @@ -912,15 +912,14 @@ void CorrelogramFrame::UpdateMessageWin() in var_man. */ void CorrelogramFrame::UpdateDataMapFromVarMan() { - using namespace std; // get set of var_man names - set vm_nms; + std::set vm_nms; for (int i=0; i to_remove; + std::set to_remove; for (data_map_type::iterator i=data_map.begin(); i!=data_map.end(); ++i) { wxString nm(i->first); if (vm_nms.find(nm) != vm_nms.end()) @@ -928,14 +927,14 @@ void CorrelogramFrame::UpdateDataMapFromVarMan() to_remove.insert(nm); } - for (set::iterator i=to_remove.begin(); i!=to_remove.end(); ++i) { + for (std::set::iterator i=to_remove.begin(); i!=to_remove.end(); ++i) { data_map.erase(*i); data_undef_map.erase(*i); } // add items to data_map that are in vm_nms, but not currently in data_map - set to_add; - for (set::iterator i=vm_nms.begin(); i!=vm_nms.end(); ++i) { + std::set to_add; + for (std::set::iterator i=vm_nms.begin(); i!=vm_nms.end(); ++i) { wxString nm(*i); if (data_map.find(nm) != data_map.end()) continue; @@ -943,7 +942,7 @@ void CorrelogramFrame::UpdateDataMapFromVarMan() } TableInterface* table_int = project->GetTableInt(); - for (set::iterator i=to_add.begin(); i!=to_add.end(); ++i) { + for (std::set::iterator i=to_add.begin(); i!=to_add.end(); ++i) { wxString nm = (*i); int c_id = table_int->FindColId(nm); if (c_id < 0) { @@ -957,10 +956,10 @@ void CorrelogramFrame::UpdateDataMapFromVarMan() table_int->GetColData(c_id, t, vec_vec_data[t]); table_int->GetColUndefined(c_id, t, vec_vec_undef[t]); } - pair p(nm, vec_vec_data); + std::pair p(nm, vec_vec_data); data_map.insert(p); - pair p_undef(nm, vec_vec_undef); + std::pair p_undef(nm, vec_vec_undef); data_undef_map.insert(p_undef); } } diff --git a/Explore/CovSpHLStateProxy.cpp b/Explore/CovSpHLStateProxy.cpp index 8d5ba6f55..215e90326 100644 --- a/Explore/CovSpHLStateProxy.cpp +++ b/Explore/CovSpHLStateProxy.cpp @@ -91,7 +91,6 @@ void CovSpHLStateProxy::notifyObservers() //LOG_MSG("In CovSpHLStateProxy::notifyObservers"); //LOG(observers.size()); // See section 18.4.4.2 of Stroustrup - using namespace std; //for_each(observers.begin(), observers.end(), // bind2nd(mem_fn(&HighlightStateObserver::update), this)); notifyHighlightState(); @@ -151,7 +150,6 @@ void CovSpHLStateProxy::update(HLStateInt* o) } } if (event_type != HLStateInt::empty) { - using namespace std; //for_each(observers.begin(), observers.end(), // bind2nd(mem_fn(&HighlightStateObserver::update), this)); } @@ -160,8 +158,7 @@ void CovSpHLStateProxy::update(HLStateInt* o) /** Translate notify event to HighlightState */ void CovSpHLStateProxy::notifyHighlightState() { - using namespace std; - vector hs(highlight_state->GetHighlight()); // make a copy + std::vector hs(highlight_state->GetHighlight()); // make a copy bool selection_changed = false; highlight_state->SetEventType(HLStateInt::empty); @@ -174,7 +171,7 @@ void CovSpHLStateProxy::notifyHighlightState() // We will the following logic: For observation i, if any of i // are selected in the (n-1) pairs, then i is considered selected. // otherwise, i is considered unselected. - vector any_hl(hs.size(), false); + std::vector any_hl(hs.size(), false); for (pairs_bimap_type::const_iterator iter = pbm.begin(), iend = pbm.end(); iter != iend; ++iter) { diff --git a/Explore/CovSpView.cpp b/Explore/CovSpView.cpp index 8d56de16e..fd8bfe5ee 100644 --- a/Explore/CovSpView.cpp +++ b/Explore/CovSpView.cpp @@ -38,8 +38,6 @@ EVT_MOUSE_EVENTS(CovSpFrame::OnMouseEvent) EVT_ACTIVATE(CovSpFrame::OnActivate) END_EVENT_TABLE() -using namespace std; - CovSpFrame::CovSpFrame(wxFrame *parent, Project* project, const GdaVarTools::Manager& var_man_, WeightsMetaInfo::DistanceMetricEnum dist_metric_, @@ -189,7 +187,7 @@ void CovSpFrame::UpdateTitle() SetTitle(s); } -wxString CovSpFrame::GetUpdateStatusBarString(const vector& hover_obs, +wxString CovSpFrame::GetUpdateStatusBarString(const std::vector& hover_obs, int total_hover_obs) { wxString s; @@ -259,7 +257,7 @@ void CovSpFrame::OnShowVarsChooser(wxCommandEvent& event) VariableSettingsDlg VS(project, VariableSettingsDlg::univariate, false, true, _("Variable Choice"), _("Variable")); if (VS.ShowModal() != wxID_OK) return; GdaVarTools::VarInfo& v = VS.var_info[0]; - vector tm_strs; + std::vector tm_strs; project->GetTableInt()->GetTimeStrings(tm_strs); GdaVarTools::Manager t_var_man(tm_strs); t_var_man.AppendVar(v.name, v.min, v.max, v.time, v.sync_with_global_time, v.fixed_scale); @@ -646,8 +644,8 @@ void CovSpFrame::UpdateDataFromVarMan() } else { Z_error_msg[t] = ""; - Zprod_min[t] = numeric_limits::max(); - Zprod_max[t] = numeric_limits::min(); + Zprod_min[t] = std::numeric_limits::max(); + Zprod_max[t] = std::numeric_limits::min(); for (pairs_bimap_type::const_iterator e=bimap.begin(); e!=bimap.end(); ++e) diff --git a/Explore/GStatCoordinator.cpp b/Explore/GStatCoordinator.cpp index 05ac1db69..64e89e840 100644 --- a/Explore/GStatCoordinator.cpp +++ b/Explore/GStatCoordinator.cpp @@ -271,7 +271,7 @@ void GStatCoordinator::InitFromVarInfo() for (int t=var_info[0].time_min; t<=var_info[0].time_max; t++) { int d_t = t - var_info[0].time_min; - vector undefs(num_obs); + std::vector undefs(num_obs); for (int i=0; i sdGstar; // number of neighbors - vector num_neighbors; + std::vector num_neighbors; // number of neighbors with 1 std::vector num_neighbors_1; diff --git a/Explore/GroupingMapView.cpp b/Explore/GroupingMapView.cpp index e30e1beab..6a7e8a5c0 100644 --- a/Explore/GroupingMapView.cpp +++ b/Explore/GroupingMapView.cpp @@ -42,8 +42,6 @@ #include "../ShapeOperations/WeightsManager.h" #include "GroupingMapView.h" -using namespace std; - HierachicalMapSelectDlg::HierachicalMapSelectDlg(wxFrame* parent_s, Project* project_s) : wxDialog(parent_s, wxID_ANY, _("Hierarchical Cluster Map"), wxDefaultPosition, wxSize(350, 250)) @@ -159,7 +157,7 @@ void HierachicalMapSelectDlg::OnOK( wxCommandEvent& event) col_ids[1] = col2; // create a weights - vector vals, root_ids; + std::vector vals, root_ids; table_int->GetColData(col1, time1, vals); if (vals.empty()) return; table_int->GetColData(col2, time2, root_ids); @@ -294,8 +292,8 @@ void HierachicalMapCanvas::CreateConnectivityGraph() // use centroids to draw graph WeightsManInterface* w_man_int = project->GetWManInt(); GalWeight* gal_weights = w_man_int->GetGal(weights_id); - const vector& c = project->GetCentroids(); - vector& hs = highlight_state->GetHighlight(); + const std::vector& c = project->GetCentroids(); + std::vector& hs = highlight_state->GetHighlight(); GdaPolyLine* edge; std::set w_nodes; wxPen pen(graph_color, weights_graph_thickness); diff --git a/Explore/GroupingMapView.h b/Explore/GroupingMapView.h index 74ee199af..b4e2d3275 100644 --- a/Explore/GroupingMapView.h +++ b/Explore/GroupingMapView.h @@ -25,8 +25,6 @@ #include "MapNewView.h" #include "../GdaConst.h" -using namespace std; - class HierachicalMapSelectDlg : public wxDialog { std::vector vars; diff --git a/Explore/LineChartView.cpp b/Explore/LineChartView.cpp index 7ddddb314..ca361ab5c 100644 --- a/Explore/LineChartView.cpp +++ b/Explore/LineChartView.cpp @@ -1122,13 +1122,13 @@ void LineChartFrame::SaveDataAndResults(bool save_weights, bool save_did, GalWeight* gw = wmi->GetGal(default_wid); wxString id_field = gw->id_field; - vector id_vec; + std::vector id_vec; int c_id = table_int->FindColId(id_field); if (c_id > 0) { table_int->GetColData(c_id, 1, id_vec); // 1 time step - vector new_id_vec; + std::vector new_id_vec; for (int ii=0; ii vm_nms; + std::set vm_nms; for (int i=0; i to_remove; + std::set to_remove; for (data_map_type::iterator i=data_map.begin(); i!=data_map.end(); ++i) { wxString nm(i->first); if (vm_nms.find(nm) != vm_nms.end()) @@ -2015,14 +2014,14 @@ void LineChartFrame::UpdateDataMapFromVarMan() to_remove.insert(nm); } - for (set::iterator i=to_remove.begin(); i!=to_remove.end(); ++i) { + for (std::set::iterator i=to_remove.begin(); i!=to_remove.end(); ++i) { data_map.erase(*i); data_map_undef.erase(*i); } // add items to data_map that are in vm_nms, but not currently in data_map - set to_add; - for (set::iterator i=vm_nms.begin(); i!=vm_nms.end(); ++i) { + std::set to_add; + for (std::set::iterator i=vm_nms.begin(); i!=vm_nms.end(); ++i) { wxString nm(*i); if (data_map.find(nm) != data_map.end()) { continue; @@ -2033,14 +2032,14 @@ void LineChartFrame::UpdateDataMapFromVarMan() TableInterface* table_int = project->GetTableInt(); int num_obs = table_int->GetNumberRows(); - for (set::iterator i=to_add.begin(); i!=to_add.end(); ++i) { + for (std::set::iterator i=to_add.begin(); i!=to_add.end(); ++i) { wxString nm = (*i); int c_id = table_int->FindColId(nm); if (c_id < 0) { continue; } int tms = table_int->GetColTimeSteps(c_id); - pair p(nm, vec_vec_dbl_type(tms)); + std::pair p(nm, vec_vec_dbl_type(tms)); data_map.insert(p); data_map_type::iterator e = data_map.find(nm); if (e == data_map.end()) { @@ -2110,7 +2109,7 @@ void LineChartFrame::UpdateStatsWinContent(int var) tm2_clr << "\"" << GdaColorUtils::ToHexColorStr(c) << "\""; } - stringstream _s; + std::stringstream _s; _s << std::fixed << std::setprecision(def_y_precision); wxString td_s0_mean; @@ -2347,7 +2346,7 @@ void LineChartFrame::UpdateStatsWinContent(int var) s<< ""; s<< _("D.F."); s<< " "; - stringstream _s; + std::stringstream _s; if (choice_groups->GetSelection() == 0) _s << (int)lcs.deg_free -1; else @@ -2379,7 +2378,7 @@ void LineChartFrame::UpdateStatsWinContent(int var) s<< ""; s<< ""; s<< ""; - stringstream _s; + std::stringstream _s; if (choice_group1->GetSelection() == 0) { _s << (int)lcs.deg_free_c[1] * 2; } else { diff --git a/Explore/LisaMapNewView.cpp b/Explore/LisaMapNewView.cpp index afd1d44f8..30c68d589 100644 --- a/Explore/LisaMapNewView.cpp +++ b/Explore/LisaMapNewView.cpp @@ -48,8 +48,6 @@ BEGIN_EVENT_TABLE(LisaMapCanvas, AbstractMapCanvas) EVT_MOUSE_CAPTURE_LOST(TemplateCanvas::OnMouseCaptureLostEvent) END_EVENT_TABLE() -using namespace std; - LisaMapCanvas::LisaMapCanvas(wxWindow *parent, TemplateFrame* t_frame, Project* project, LisaCoordinator* lisa_coordinator, diff --git a/Explore/LocalGearyCoordinator.cpp b/Explore/LocalGearyCoordinator.cpp index 84e550de5..8e4c09cb2 100644 --- a/Explore/LocalGearyCoordinator.cpp +++ b/Explore/LocalGearyCoordinator.cpp @@ -34,8 +34,6 @@ #include "LocalGearyCoordinatorObserver.h" #include "LocalGearyCoordinator.h" -using namespace std; - LocalGearyWorkerThread::LocalGearyWorkerThread(int obs_start_s, int obs_end_s, uint64_t seed_start_s, LocalGearyCoordinator* local_geary_coord_s, @@ -80,8 +78,8 @@ wxThread::ExitCode LocalGearyWorkerThread::Entry() LocalGearyCoordinator::LocalGearyCoordinator(boost::uuids::uuid weights_id, Project* project, - const vector& var_info_s, - const vector& col_ids, + const std::vector& var_info_s, + const std::vector& col_ids, LocalGearyType local_geary_type_s, bool calc_significances_s, bool row_standardize_s) @@ -119,7 +117,7 @@ row_standardize(row_standardize_s) w_man_state->registerObserver(this); } -LocalGearyCoordinator::LocalGearyCoordinator(wxString weights_path, int n, vector >& vars, int permutations_s, bool calc_significances_s, bool row_standardize_s) +LocalGearyCoordinator::LocalGearyCoordinator(wxString weights_path, int n, std::vector >& vars, int permutations_s, bool calc_significances_s, bool row_standardize_s) { wxLogMessage("In LocalGearyCoordinator::LocalGearyCoordinator()2"); reuse_last_seed = GdaConst::use_gda_user_seed; @@ -386,7 +384,7 @@ void LocalGearyCoordinator::InitFromVarInfo() } } else { // local_geary_type == eb_rate_standardized - vector undef_res(num_obs, false); + std::vector undef_res(num_obs, false); double* smoothed_results = new double[num_obs]; double* E = new double[num_obs]; // E corresponds to var_info[0] double* P = new double[num_obs]; // P corresponds to var_info[1] @@ -470,7 +468,7 @@ void LocalGearyCoordinator::GetRawData(int time, double* data1, double* data2) } } } else { // local_geary_type == eb_rate_standardized - vector undef_res(num_obs, false); + std::vector undef_res(num_obs, false); double* smoothed_results = new double[num_obs]; double* E = new double[num_obs]; // E corresponds to var_info[0] double* P = new double[num_obs]; // P corresponds to var_info[1] @@ -578,7 +576,7 @@ void LocalGearyCoordinator::CalcMultiLocalGeary() wxLogMessage("In LocalGearyCoordinator::CalcMultiLocalGeary()"); for (int t=0; t undefs; + std::vector undefs; bool has_undef = false; for (int i=0; i local_t; + std::vector local_t; int delta_t = t - var_info[0].time; for (int v=0; v undefs; + std::vector undefs; bool has_undef = false; for (int i=0; i worker_list; + std::list worker_list; // divide up work according to number of observations // and number of CPUs @@ -888,11 +886,11 @@ void LocalGearyCoordinator::CalcPseudoP_range(int obs_start, int obs_end, uint64 double* _data1 = NULL; double* _data1_square = NULL; double* _data2 = NULL; - vector current_data(num_vars); - vector current_data_square(num_vars); + std::vector current_data(num_vars); + std::vector current_data_square(num_vars); if (local_geary_type == multivariate) { - vector local_t; + std::vector local_t; int delta_t = t - var_info[0].time; for (int v=0; v obs_cpy = observers; - for (list::iterator i=obs_cpy.begin(); + std::list obs_cpy = observers; + for (std::list::iterator i=obs_cpy.begin(); i != obs_cpy.end(); ++i) { (*i)->closeObserver(this); } @@ -1117,7 +1115,7 @@ void LocalGearyCoordinator::removeObserver(LocalGearyCoordinatorObserver* o) void LocalGearyCoordinator::notifyObservers() { wxLogMessage("In LocalGearyCoordinator::notifyObservers()"); - for (list::iterator it=observers.begin(); + for (std::list::iterator it=observers.begin(); it != observers.end(); ++it) { (*it)->update(this); } diff --git a/Explore/LocalGearyCoordinator.h b/Explore/LocalGearyCoordinator.h index 0223106b8..707073a4d 100644 --- a/Explore/LocalGearyCoordinator.h +++ b/Explore/LocalGearyCoordinator.h @@ -31,8 +31,6 @@ #include "../ShapeOperations/WeightsManStateObserver.h" #include "../ShapeOperations/OGRDataAdapter.h" -using namespace std; - class LocalGearyCoordinatorObserver; class LocalGearyCoordinator; class Project; @@ -76,14 +74,14 @@ class LocalGearyCoordinator : public WeightsManStateObserver LocalGearyCoordinator(boost::uuids::uuid weights_id, Project* project, - const vector& var_info, - const vector& col_ids, + const std::vector& var_info, + const std::vector& col_ids, LocalGearyType local_geary_type, bool calc_significances = true, bool row_standardize_s = true); LocalGearyCoordinator(wxString weights_path, int n, - vector >& vars, + std::vector >& vars, int permutations_s = 599, bool calc_significances_s = true, bool row_standardize_s = true); @@ -144,19 +142,19 @@ class LocalGearyCoordinator : public WeightsManStateObserver virtual void closeObserver(boost::uuids::uuid id); public: - vector lags_vecs; - vector local_geary_vecs; - vector sig_local_geary_vecs; - vector sig_cat_vecs; - vector cluster_vecs; - - vector data1_vecs; - vector data1_square_vecs; - vector data2_vecs; + std::vector lags_vecs; + std::vector local_geary_vecs; + std::vector sig_local_geary_vecs; + std::vector sig_cat_vecs; + std::vector cluster_vecs; + + std::vector data1_vecs; + std::vector data1_square_vecs; + std::vector data2_vecs; boost::uuids::uuid w_id; - vector Gal_vecs; - vector Gal_vecs_orig; + std::vector Gal_vecs; + std::vector Gal_vecs_orig; //const GalElement* W; wxString weight_name; @@ -168,23 +166,23 @@ class LocalGearyCoordinator : public WeightsManStateObserver int num_time_vals; // number of valid time periods based on var_info // These two variables should be empty for LocalGearyMapCanvas - vector data; // data[variable][time][obs] - vector undef_data; // undef_data[variable][time][obs] + std::vector data; // data[variable][time][obs] + std::vector undef_data; // undef_data[variable][time][obs] - vector > undef_tms; + std::vector > undef_tms; // These are for multi variable LocalGeary - vector > data_vecs; - vector > data_square_vecs; + std::vector > data_vecs; + std::vector > data_square_vecs; // All LocalGearyMapCanvas objects synchronize themselves // from the following 6 variables. int ref_var_index; - vector var_info; + std::vector var_info; bool is_any_time_variant; bool is_any_sync_with_global_time; - vector map_valid; - vector map_error_message; + std::vector map_valid; + std::vector map_error_message; bool GetHasIsolates(int time) { return has_isolates[time]; } bool GetHasUndefined(int time) { return has_undefined[time]; } @@ -193,7 +191,7 @@ class LocalGearyCoordinator : public WeightsManStateObserver void removeObserver(LocalGearyCoordinatorObserver* o); void notifyObservers(); /** The list of registered observer objects. */ - list observers; + std::list observers; void CalcPseudoP(); void CalcPseudoP_range(int obs_start, @@ -224,8 +222,8 @@ class LocalGearyCoordinator : public WeightsManStateObserver void CalcLocalGeary(); void CalcMultiLocalGeary(); void StandardizeData(); - vector has_undefined; - vector has_isolates; + std::vector has_undefined; + std::vector has_isolates; bool row_standardize; bool calc_significances; // if false, then p-vals will never be needed uint64_t last_seed_used; diff --git a/Explore/LocalGearyMapNewView.cpp b/Explore/LocalGearyMapNewView.cpp index 27d8e12b6..3bcee78bb 100644 --- a/Explore/LocalGearyMapNewView.cpp +++ b/Explore/LocalGearyMapNewView.cpp @@ -49,8 +49,6 @@ BEGIN_EVENT_TABLE(LocalGearyMapCanvas, MapCanvas) EVT_MOUSE_CAPTURE_LOST(TemplateCanvas::OnMouseCaptureLostEvent) END_EVENT_TABLE() -using namespace std; - LocalGearyMapCanvas::LocalGearyMapCanvas(wxWindow *parent, TemplateFrame* t_frame, Project* project, LocalGearyCoordinator* local_geary_coordinator, @@ -58,7 +56,7 @@ LocalGearyMapCanvas::LocalGearyMapCanvas(wxWindow *parent, TemplateFrame* t_fram bool isBivariate, bool isEBRate, const wxPoint& pos, const wxSize& size) :MapCanvas(parent, t_frame, project, - vector(0), vector(0), + std::vector(0), std::vector(0), CatClassification::no_theme, no_smoothing, 1, boost::uuids::nil_uuid(), pos, size), local_geary_coord(local_geary_coordinator), diff --git a/Explore/MLJCCoordinator.cpp b/Explore/MLJCCoordinator.cpp index d374a0b38..6eaaad81c 100644 --- a/Explore/MLJCCoordinator.cpp +++ b/Explore/MLJCCoordinator.cpp @@ -315,7 +315,7 @@ void JCCoordinator::CalcMultiLocalJoinCount() { for (int t=0; t undefs; + std::vector undefs; bool has_undef = false; for (int i=0; i local_t; + std::vector local_t; int delta_t = t - var_info[0].time; for (int v=0; v local_t; + std::vector local_t; for (int v=0; v& undefs = undef_tms[t]; double* pseudo_p = sig_local_jc_vecs[t]; - vector local_t; + std::vector local_t; int delta_t = t - var_info[0].time; for (int v=0; v > data_vecs; - vector > undef_tms; - vector zz_vecs; - vector local_jc_vecs; - vector sig_local_jc_vecs; + std::vector > data_vecs; + std::vector > undef_tms; + std::vector zz_vecs; + std::vector local_jc_vecs; + std::vector sig_local_jc_vecs; std::vector > num_neighbors; std::vector Gal_vecs; diff --git a/Explore/MapLayer.cpp b/Explore/MapLayer.cpp index a59d190f9..1783fef7d 100644 --- a/Explore/MapLayer.cpp +++ b/Explore/MapLayer.cpp @@ -94,7 +94,7 @@ wxString BackgroundMapLayer::GetAssociationText() void BackgroundMapLayer::RemoveAssociatedLayer(AssociateLayerInt* layer) { AssociateLayerInt* del_key = NULL; - map::iterator it; + std::map::iterator it; for (it=associated_layers.begin(); it!=associated_layers.end();it++) { AssociateLayerInt* asso_layer = it->first; if (layer->GetName() == asso_layer->GetName()) { @@ -108,13 +108,13 @@ void BackgroundMapLayer::RemoveAssociatedLayer(AssociateLayerInt* layer) void BackgroundMapLayer::SetLayerAssociation(wxString my_key, AssociateLayerInt* layer, wxString key, bool show_connline) { - associated_layers[layer] = make_pair(my_key, key); + associated_layers[layer] = std::make_pair(my_key, key); associated_lines[layer] = show_connline; } bool BackgroundMapLayer::IsAssociatedWith(AssociateLayerInt* layer) { - map::iterator it; + std::map::iterator it; for (it=associated_layers.begin(); it!=associated_layers.end();it++) { AssociateLayerInt* asso_layer = it->first; if (layer->GetName() == asso_layer->GetName()) { @@ -197,14 +197,14 @@ int BackgroundMapLayer::GetHighlightRecords() void BackgroundMapLayer::DrawHighlight(wxMemoryDC& dc, MapCanvas* map_canvas) { // draw any connected layers - map::iterator it; + std::map::iterator it; for (it=associated_layers.begin(); it!=associated_layers.end();it++) { AssociateLayerInt* associated_layer = it->first; Association& al = it->second; wxString primary_key = al.first; wxString associated_key = al.second; - vector pid(shapes.size()); // e.g. 1 2 3 4 5 + std::vector pid(shapes.size()); // e.g. 1 2 3 4 5 if (primary_key.IsEmpty() == false) { GetKeyColumnData(primary_key, pid); } else { @@ -212,11 +212,11 @@ void BackgroundMapLayer::DrawHighlight(wxMemoryDC& dc, MapCanvas* map_canvas) pid[i] << i; } } - vector fid; // e.g. 2 2 1 1 3 5 4 4 + std::vector fid; // e.g. 2 2 1 1 3 5 4 4 associated_layer->GetKeyColumnData(associated_key, fid); associated_layer->ResetHighlight(); - map > aid_idx; + std::map > aid_idx; for (int i=0; i& ids = aid_idx[aid]; + std::vector& ids = aid_idx[aid]; for (int j=0; jSetHighlight( ids[j] ); } @@ -246,7 +246,7 @@ void BackgroundMapLayer::DrawHighlight(wxMemoryDC& dc, MapCanvas* map_canvas) if (aid_idx.find(aid) == aid_idx.end()) { continue; } - vector& ids = aid_idx[aid]; + std::vector& ids = aid_idx[aid]; for (int j=0; jIsHide()) { dc.DrawLine(shapes[i]->center, associated_layer->GetShape(ids[j])->center); @@ -340,7 +340,7 @@ int BackgroundMapLayer::GetNumRecords() } bool BackgroundMapLayer::GetDoubleColumnData(wxString field_name, - vector& data) + std::vector& data) { if (field_name.empty()) return false; @@ -360,7 +360,7 @@ bool BackgroundMapLayer::GetDoubleColumnData(wxString field_name, return false; } -bool BackgroundMapLayer::GetIntegerColumnData(wxString field_name, vector& data) +bool BackgroundMapLayer::GetIntegerColumnData(wxString field_name, std::vector& data) { if (data.empty()) { data.resize(shapes.size()); @@ -381,7 +381,7 @@ bool BackgroundMapLayer::GetIntegerColumnData(wxString field_name, vector& data) +bool BackgroundMapLayer::GetKeyColumnData(wxString field_name, std::vector& data) { if (data.empty()) { data.resize(shapes.size()); @@ -412,32 +412,32 @@ bool BackgroundMapLayer::GetKeyColumnData(wxString field_name, vector& return false; } -vector BackgroundMapLayer::GetIntegerFieldNames() +std::vector BackgroundMapLayer::GetIntegerFieldNames() { return field_names; } -vector BackgroundMapLayer::GetNumericFieldNames() +std::vector BackgroundMapLayer::GetNumericFieldNames() { return num_field_names; } -void BackgroundMapLayer::SetNumericFieldNames(vector& names) +void BackgroundMapLayer::SetNumericFieldNames(std::vector& names) { num_field_names = names; } -vector BackgroundMapLayer::GetKeyNames() +std::vector BackgroundMapLayer::GetKeyNames() { return key_names; } -void BackgroundMapLayer::SetKeyNames(vector& names) +void BackgroundMapLayer::SetKeyNames(std::vector& names) { key_names = names; } -void BackgroundMapLayer::SetFieldNames(vector& names) +void BackgroundMapLayer::SetFieldNames(std::vector& names) { field_names = names; } @@ -534,7 +534,7 @@ int BackgroundMapLayer::GetPointRadius() return point_radius; } -vector& BackgroundMapLayer::GetShapes() +std::vector& BackgroundMapLayer::GetShapes() { return shapes; } diff --git a/Explore/MapLayer.hpp b/Explore/MapLayer.hpp index dd5762ce5..4355ea055 100644 --- a/Explore/MapLayer.hpp +++ b/Explore/MapLayer.hpp @@ -15,13 +15,11 @@ #include "../GdaShape.h" #include "../ShapeOperations/OGRLayerProxy.h" -using namespace std; - class MapCanvas; class AssociateLayerInt; // my_key, key from other layer -typedef pair Association; +typedef std::pair Association; // Interfaces for map layer setting highlight association to any other map layer // It is implemented by: BackgroundMapLayer and MapCanvas @@ -33,8 +31,8 @@ class AssociateLayerInt public: // primary key : AssociateLayer - map associated_layers; - map associated_lines; + std::map associated_layers; + std::map associated_lines; AssociateLayerInt() : associate_pencolor(wxColour(50, 50, 50)) {} virtual ~AssociateLayerInt() {} @@ -43,9 +41,9 @@ class AssociateLayerInt virtual wxString GetName() = 0; virtual int GetNumRecords() = 0; - virtual vector GetKeyNames() = 0; - virtual bool GetKeyColumnData(wxString col_name, vector& data) = 0; - //virtual bool GetColumnData(wxString col_name, vector& data) = 0; + virtual std::vector GetKeyNames() = 0; + virtual bool GetKeyColumnData(wxString col_name, std::vector& data) = 0; + //virtual bool GetColumnData(wxString col_name, std::vector& data) = 0; virtual void ResetHighlight() = 0; virtual void SetHighlight(int idx) = 0; @@ -53,7 +51,7 @@ class AssociateLayerInt virtual int GetHighlightRecords() = 0; virtual GdaShape* GetShape(int i) = 0; - //virtual vector GetShapes() = 0; + //virtual std::vector GetShapes() = 0; virtual void GetExtent(double &minx, double &miny, double &maxx, double &maxy) = 0; virtual void GetExtentOfSelected(double &minx, double &miny, double &maxx, @@ -86,9 +84,9 @@ class BackgroundMapLayer : public AssociateLayerInt { int num_obs; Shapefile::ShapeType shape_type; - vector field_names; - vector num_field_names; - vector key_names; + std::vector field_names; + std::vector num_field_names; + std::vector key_names; bool show_connect_line; wxString layer_name; @@ -106,9 +104,9 @@ class BackgroundMapLayer : public AssociateLayerInt public: OGRLayerProxy* layer_proxy; GdaPolygon* map_boundary; - vector shapes; - vector geoms; - vector highlight_flags; + std::vector shapes; + std::vector geoms; + std::vector highlight_flags; BackgroundMapLayer(); BackgroundMapLayer(wxString name, OGRLayerProxy* layer_proxy, OGRSpatialReference* sr); @@ -116,7 +114,7 @@ class BackgroundMapLayer : public AssociateLayerInt virtual bool IsCurrentMap(); virtual int GetNumRecords(); - virtual bool GetKeyColumnData(wxString field_name, vector& data); + virtual bool GetKeyColumnData(wxString field_name, std::vector& data); virtual void SetHighlight(int idx); virtual void SetUnHighlight(int idx); virtual void ResetHighlight(); @@ -134,7 +132,7 @@ class BackgroundMapLayer : public AssociateLayerInt // so that different map window can configure the multi-layers BackgroundMapLayer* Clone(bool clone_style=false); - vector& GetShapes(); + std::vector& GetShapes(); virtual GdaShape* GetShape(int idx); void CleanMemory(); @@ -165,16 +163,16 @@ class BackgroundMapLayer : public AssociateLayerInt bool IsShowBoundary(); void SetShowBoundary(bool flag); - void SetKeyNames(vector& names); - vector GetKeyNames(); + void SetKeyNames(std::vector& names); + std::vector GetKeyNames(); - void SetNumericFieldNames(vector& names); - vector GetNumericFieldNames(); - bool GetDoubleColumnData(wxString field_name, vector& data); + void SetNumericFieldNames(std::vector& names); + std::vector GetNumericFieldNames(); + bool GetDoubleColumnData(wxString field_name, std::vector& data); - void SetFieldNames(vector& names); - vector GetIntegerFieldNames(); - bool GetIntegerColumnData(wxString field_name, vector& data); + void SetFieldNames(std::vector& names); + std::vector GetIntegerFieldNames(); + bool GetIntegerColumnData(wxString field_name, std::vector& data); void drawLegend(wxDC& dc, int x, int y, int w, int h); }; diff --git a/Explore/MapLayerTree.cpp b/Explore/MapLayerTree.cpp index 2dbda1350..dbc33972b 100644 --- a/Explore/MapLayerTree.cpp +++ b/Explore/MapLayerTree.cpp @@ -24,7 +24,7 @@ wxString SetAssociationDlg::LAYER_LIST_ID = "SETASSOCIATIONDLG_LAYER_LIST"; -SetAssociationDlg::SetAssociationDlg(wxWindow* parent, AssociateLayerInt* ml,vector& _all_layers, const wxString& title, const wxPoint& pos, const wxSize& size) +SetAssociationDlg::SetAssociationDlg(wxWindow* parent, AssociateLayerInt* ml, std::vector& _all_layers, const wxString& title, const wxPoint& pos, const wxSize& size) : wxDialog(parent, wxID_ANY, title, pos, size) { current_ml = ml; @@ -115,15 +115,15 @@ void SetAssociationDlg::Init() my_field_list[i]->Clear(); my_field_list[i]->Append(""); my_field_list[i]->Append(_("(Use Sequences)")); - vector my_fieldnames = current_ml->GetKeyNames(); + std::vector my_fieldnames = current_ml->GetKeyNames(); for (int j=0; jAppend(my_fieldnames[j]); } } int i = 0; - map& asso = current_ml->associated_layers; - map::iterator it; + std::map& asso = current_ml->associated_layers; + std::map::iterator it; for (it = asso.begin(); it!=asso.end(); it++) { AssociateLayerInt* layer = it->first; Association& lyr = it->second; @@ -149,7 +149,7 @@ void SetAssociationDlg::Init() if (key.IsEmpty()) { field_list[i]->SetSelection(1); } else { - vector names = ml->GetKeyNames(); + std::vector names = ml->GetKeyNames(); for (int j=0; jSetSelection(j+2); @@ -162,7 +162,7 @@ void SetAssociationDlg::Init() } } - vector my_fieldnames = current_ml->GetKeyNames(); + std::vector my_fieldnames = current_ml->GetKeyNames(); for (int j=0; jSetSelection(j+2); @@ -210,7 +210,7 @@ void SetAssociationDlg::OnLayerSelect(wxCommandEvent& e) if (ml) { field_list[sel_row]->Append(""); field_list[sel_row]->Append(_("(Use Sequences)")); - vector names = ml->GetKeyNames(); + std::vector names = ml->GetKeyNames(); for (int i=0; iAppend(names[i]); } @@ -463,7 +463,7 @@ void MapTree::OnSpatialJoinCount(wxCommandEvent& event) OGRLayerProxy* ogr_layer = canvas->GetOGRLayerProxy(); Shapefile::PolygonContents* pc; int n_polygons = main_data.records.size(); - vector spatial_counts(n_polygons, 0); + std::vector spatial_counts(n_polygons, 0); for (int i=0; i new_data(new_col); - vector undefs(n_polygons, false); + std::vector undefs(n_polygons, false); new_data[0].l_val = &spatial_counts; new_data[0].label = "Spatial Counts"; new_data[0].field_default = "SC"; @@ -626,7 +626,7 @@ void MapTree::OnZoomToSelected(wxCommandEvent& event) void MapTree::OnSetAssociateLayer(wxCommandEvent& event) { - vector all_layers; + std::vector all_layers; wxString map_name = map_titles[new_order[select_id]]; AssociateLayerInt* ml = GetMapLayer(map_name); @@ -655,14 +655,14 @@ void MapTree::OnSetAssociateLayer(wxCommandEvent& event) if (dlg.ShowModal() == wxID_OK) { bool check_flag = false; - map::iterator it; + std::map::iterator it; for (int i=0; i checker; - vector stack; + std::map checker; + std::vector stack; stack.push_back(ml); @@ -676,7 +676,7 @@ void MapTree::OnSetAssociateLayer(wxCommandEvent& event) } else { checker[tmp_ml->GetName()] = true; } - map& asso = tmp_ml->associated_layers; + std::map& asso = tmp_ml->associated_layers; for (it = asso.begin(); it!= asso.end(); it++) { AssociateLayerInt* layer = it->first; Association& lyr = it->second; @@ -1065,8 +1065,8 @@ BackgroundMapLayer* MapTree::GetMapLayer(wxString map_name) void MapTree::OnMapLayerChange() { - vector new_bg_maps; - vector new_fg_maps; + std::vector new_bg_maps; + std::vector new_fg_maps; bool is_fgmap = true; for (int i=0; i layer_list; - vector field_list; - vector my_field_list; - vector conn_list; + std::vector layer_list; + std::vector field_list; + std::vector my_field_list; + std::vector conn_list; AssociateLayerInt* current_ml; - vector all_layers; + std::vector all_layers; int GetSelectRow(wxCommandEvent& e); bool CheckLayerValid(int row, wxString layer_name); public: SetAssociationDlg(wxWindow* parent, AssociateLayerInt* ml, - vector& _all_layers, + std::vector& _all_layers, const wxString& title = _("Set Association Dialog"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(480,300)); @@ -69,11 +67,11 @@ class MapTree: public wxWindow int opt_menu_cat; // last category added to Legend menu wxString current_map_title; - vector map_titles; + std::vector map_titles; MapCanvas* canvas; - vector bg_maps; - vector fg_maps; + std::vector bg_maps; + std::vector fg_maps; bool recreate_labels; std::vector new_order; diff --git a/Explore/MapLayoutView.cpp b/Explore/MapLayoutView.cpp index dd5ea79d5..c7ba7d489 100644 --- a/Explore/MapLayoutView.cpp +++ b/Explore/MapLayoutView.cpp @@ -14,9 +14,6 @@ #include "MapLayoutView.h" -using namespace std; - - CanvasExportSettingDialog::CanvasExportSettingDialog(int w, int h, const wxString & title) : wxDialog(NULL, wxID_ANY, title, wxDefaultPosition, wxSize(320, 230)) { diff --git a/Explore/MapNewView.cpp b/Explore/MapNewView.cpp index 12e69f53c..32356373e 100644 --- a/Explore/MapNewView.cpp +++ b/Explore/MapNewView.cpp @@ -2409,7 +2409,7 @@ GdaShape* MapCanvas::GetShape(int i) void MapCanvas::SetLayerAssociation(wxString my_key, AssociateLayerInt* layer, wxString key, bool show_connline) { - associated_layers[layer] = make_pair(my_key, key); + associated_layers[layer] = std::make_pair(my_key, key); associated_lines[layer] = show_connline; } diff --git a/Explore/PCPNewView.cpp b/Explore/PCPNewView.cpp index cd9434b17..b120a8738 100644 --- a/Explore/PCPNewView.cpp +++ b/Explore/PCPNewView.cpp @@ -1215,9 +1215,9 @@ void PCPFrame::AppendCustomCategories(wxMenu* menu, CatClassifManager* ccm) { // search for ID_CAT_CLASSIF_A(B,C)_MENU submenus const int num_sub_menus=3; - vector menu_id(num_sub_menus); - vector sub_menu_id(num_sub_menus); - vector base_id(num_sub_menus); + std::vector menu_id(num_sub_menus); + std::vector sub_menu_id(num_sub_menus); + std::vector base_id(num_sub_menus); menu_id[0] = XRCID("ID_NEW_CUSTOM_CAT_CLASSIF_A"); menu_id[1] = XRCID("ID_NEW_CUSTOM_CAT_CLASSIF_B"); // conditional horizontal menu menu_id[2] = XRCID("ID_NEW_CUSTOM_CAT_CLASSIF_C"); // conditional verticle menu @@ -1247,7 +1247,7 @@ void PCPFrame::AppendCustomCategories(wxMenu* menu, CatClassifManager* ccm) sm->Append(menu_id[i], _("Create New Custom"), _("Create new custom categories classification.")); sm->AppendSeparator(); - vector titles; + std::vector titles; ccm->GetTitles(titles); for (size_t j=0; jAppend(base_id[i]+j, titles[j]); @@ -1270,7 +1270,7 @@ void PCPFrame::OnCustomCategoryClick(wxCommandEvent& event) int xrc_id = event.GetId(); CatClassifManager* ccm = project->GetCatClassifManager(); if (!ccm) return; - vector titles; + std::vector titles; ccm->GetTitles(titles); int idx = xrc_id - GdaConst::ID_CUSTOM_CAT_CLASSIF_CHOICE_A0; if (idx < 0 || idx >= titles.size()) return; diff --git a/Explore/PCPNewView.h b/Explore/PCPNewView.h index c57665f20..8b4f10509 100644 --- a/Explore/PCPNewView.h +++ b/Explore/PCPNewView.h @@ -187,8 +187,8 @@ class PCPFrame : public TemplateFrame { virtual void OnCustomCategoryClick(wxCommandEvent& event); void AppendCustomCategories(wxMenu* menu, CatClassifManager* ccm); - vector var_info; - vector col_ids; + std::vector var_info; + std::vector col_ids; protected: void ChangeThemeType(CatClassification::CatClassifType new_theme, diff --git a/Explore/ScatterPlotMatView.cpp b/Explore/ScatterPlotMatView.cpp index 3c3632515..0a0d3f278 100644 --- a/Explore/ScatterPlotMatView.cpp +++ b/Explore/ScatterPlotMatView.cpp @@ -34,8 +34,6 @@ #include "SimpleHistCanvas.h" #include "ScatterPlotMatView.h" -using namespace std; - BEGIN_EVENT_TABLE(ScatterPlotMatFrame, TemplateFrame) EVT_MOUSE_EVENTS(ScatterPlotMatFrame::OnMouseEvent) EVT_ACTIVATE(ScatterPlotMatFrame::OnActivate) @@ -60,7 +58,7 @@ axis_display_precision(1), axis_display_fixed_point(false) supports_timeline_changes = true; { - vector tm_strs; + std::vector tm_strs; project->GetTableInt()->GetTimeStrings(tm_strs); var_man.ClearAndInit(tm_strs); } @@ -518,8 +516,8 @@ void ScatterPlotMatFrame::SetupPanelForNumVariables(int num_vars) row_tm = 0; wxString row_title(var_man.GetNameWithTime(row)); - const vector& Y(data_map[row_nm][row_tm]); - vector XY_undef(data_undef_map[row_nm][row_tm]); + const std::vector& Y(data_map[row_nm][row_tm]); + std::vector XY_undef(data_undef_map[row_nm][row_tm]); // get XY_undef for (int col=0; col& X_undef = data_undef_map[col_nm][col_tm]; + const std::vector& X_undef = data_undef_map[col_nm][col_tm]; for (size_t ii=0; ii& X(data_map[col_nm][col_tm]); + const std::vector& X(data_map[col_nm][col_tm]); double col_min = 0; double col_max = 0; bool has_init = false; @@ -621,8 +619,8 @@ void ScatterPlotMatFrame::SetupPanelForNumVariables(int num_vars) if (X[i] > col_max) col_max = X[i]; } - const vector& X_undef = data_undef_map[row_nm][row_tm]; - const vector& Y_undef = data_undef_map[col_nm][col_tm]; + const std::vector& X_undef = data_undef_map[row_nm][row_tm]; + const std::vector& Y_undef = data_undef_map[col_nm][col_tm]; wxString xrcid_scatter_menu = "ID_SCATTER_PLOT_MAT_MENU_OPTIONS"; SimpleScatterPlotCanvas* sp_can = 0; sp_can = new SimpleScatterPlotCanvas(panel, this, project, @@ -721,33 +719,33 @@ void ScatterPlotMatFrame::UpdateMessageWin() void ScatterPlotMatFrame::UpdateDataMapFromVarMan() { // get set of var_man names - set vm_nms; + std::set vm_nms; for (int i=0; i to_remove; + std::set to_remove; for (data_map_type::iterator i=data_map.begin(); i!=data_map.end(); ++i) { wxString nm(i->first); if (vm_nms.find(nm) != vm_nms.end()) continue; to_remove.insert(nm); } - for (set::iterator i=to_remove.begin(); i!=to_remove.end(); ++i) { + for (std::set::iterator i=to_remove.begin(); i!=to_remove.end(); ++i) { data_map.erase(*i); } // add items to data_map that are in vm_nms, but not currently in data_map - set to_add; - for (set::iterator i=vm_nms.begin(); i!=vm_nms.end(); ++i) { + std::set to_add; + for (std::set::iterator i=vm_nms.begin(); i!=vm_nms.end(); ++i) { wxString nm(*i); if (data_map.find(nm) != data_map.end()) continue; to_add.insert(nm); } TableInterface* table_int = project->GetTableInt(); - for (set::iterator i=to_add.begin(); i!=to_add.end(); ++i) { + for (std::set::iterator i=to_add.begin(); i!=to_add.end(); ++i) { wxString nm = (*i); wxString group_name = nm; int c_id = table_int->FindColId(nm); @@ -804,7 +802,7 @@ wxString ScatterPlotMatFrame::GetHelpHtml() return s; } -void ScatterPlotMatFrame::GetVizInfo(vector& vars) +void ScatterPlotMatFrame::GetVizInfo(std::vector& vars) { for (int i=0; i& vars); + void GetVizInfo(std::vector& vars); protected: void SetupPanelForNumVariables(int num_vars); diff --git a/Explore/SimpleHistCanvas.cpp b/Explore/SimpleHistCanvas.cpp index 6e249345a..f76519332 100644 --- a/Explore/SimpleHistCanvas.cpp +++ b/Explore/SimpleHistCanvas.cpp @@ -39,8 +39,6 @@ #include "SimpleHistCanvas.h" -using namespace std; - //////////////////////////////////////////////////////////////////////////////// // // // @@ -58,9 +56,9 @@ SimpleHistStatsCanvas::SimpleHistStatsCanvas(wxWindow *parent, TemplateFrame* t_frame, Project* project, HLStateInt* hl_state_int, - const vector& lbls, - const vector >& vals, - const vector& stats_, + const std::vector& lbls, + const std::vector >& vals, + const std::vector& stats_, const int display_precision_, const bool display_fixed_point_, const wxString& right_click_menu_id_, @@ -97,9 +95,9 @@ void SimpleHistStatsCanvas::PopulateCanvas() // orig_x_pos is the center of each histogram bar int cur_intervals = values.size(); - vector orig_x_pos(cur_intervals); - vector orig_x_pos_left(cur_intervals); - vector orig_x_pos_right(cur_intervals); + std::vector orig_x_pos(cur_intervals); + std::vector orig_x_pos_left(cur_intervals); + std::vector orig_x_pos_right(cur_intervals); int default_intervals = 7; double left_pad = 0; double right_pad = 0; @@ -127,7 +125,7 @@ void SimpleHistStatsCanvas::PopulateCanvas() int cols = 1; int rows = labels.size(); - vector attribs(0); // undefined + std::vector attribs(0); // undefined wxFont font = *GdaConst::small_font; wxRealPoint ref_pt(0, 0); GdaShapeText::HorizAlignment horiz_align = GdaShapeText::h_center; diff --git a/Explore/SimpleHistCanvas.h b/Explore/SimpleHistCanvas.h index b291fa062..88525bae7 100644 --- a/Explore/SimpleHistCanvas.h +++ b/Explore/SimpleHistCanvas.h @@ -30,8 +30,6 @@ #include "../TemplateFrame.h" #include "../GdaShape.h" -using namespace std; - class HighlightState; class Project; @@ -42,9 +40,9 @@ class SimpleHistStatsCanvas : public TemplateCanvas SimpleHistStatsCanvas(wxWindow *parent, TemplateFrame* t_frame, Project* project, HLStateInt* hl_state_int, - const vector& labels, - const vector >& values, - const vector& stats_, + const std::vector& labels, + const std::vector >& values, + const std::vector& stats_, const int display_precision = 3, const bool display_fixed_point = false, const wxString& right_click_menu_id = wxEmptyString, @@ -62,9 +60,9 @@ class SimpleHistStatsCanvas : public TemplateCanvas virtual void PopulateCanvas(); wxString right_click_menu_id; - vector labels; - vector > values; - vector stats; + std::vector labels; + std::vector > values; + std::vector stats; DECLARE_EVENT_TABLE() }; @@ -74,8 +72,8 @@ class SimpleHistCanvas : public TemplateCanvas DECLARE_CLASS(SimpleHistCanvas) SimpleHistCanvas(wxWindow *parent, TemplateFrame* t_frame, Project* project, HLStateInt* hl_state_int, - const vector& X, - const vector& X_undef, + const std::vector& X, + const std::vector& X_undef, const wxString& Xname, double Xmin, double Xmax, bool show_axes = false, const wxPoint& pos = wxDefaultPosition, @@ -105,8 +103,8 @@ class SimpleHistCanvas : public TemplateCanvas virtual void UpdateStatusBar(); protected: - const vector& X; - const vector& X_undef; + const std::vector& X; + const std::vector& X_undef; wxString Xname; // used for scaling, so can be smaller/larger than min/max in X double Xmin, Xmax; @@ -122,16 +120,16 @@ class SimpleHistCanvas : public TemplateCanvas bool show_axes; bool display_stats; - vector ival_breaks; // size = cur_num_intervals-1 + std::vector ival_breaks; // size = cur_num_intervals-1 double min_ival_val; double max_ival_val; double max_num_obs_in_ival; double overall_max_num_obs_in_ival; int cur_intervals; - vector ival_obs_cnt; // size = cur_num_intervals - vector ival_obs_sel_cnt; // size = cur_num_intervals - vector obs_id_to_ival; // size = num_obs - vector > ival_to_obs_ids; + std::vector ival_obs_cnt; // size = cur_num_intervals + std::vector ival_obs_sel_cnt; // size = cur_num_intervals + std::vector obs_id_to_ival; // size = num_obs + std::vector > ival_to_obs_ids; int max_intervals; // min of num_obs and MAX_INTERVALS static const int MAX_INTERVALS; diff --git a/Explore/WebViewExampleWin.cpp b/Explore/WebViewExampleWin.cpp index 0bec35a03..00627895a 100644 --- a/Explore/WebViewExampleWin.cpp +++ b/Explore/WebViewExampleWin.cpp @@ -236,11 +236,11 @@ void WebViewExampleDlg::parseHighlightStateNotify(const json_spirit::Value& v) } std::vector new_hl_vec; if (!GdaJson::arrayToVec(new_hl.get_array(), new_hl_vec)) { - throw std::runtime_error("could not convert Array to vector"); + throw std::runtime_error("could not convert Array to std::vector"); } std::vector new_uhl_vec; if (!GdaJson::arrayToVec(new_uhl.get_array(), new_uhl_vec)) { - throw std::runtime_error("could not convert Array to vector"); + throw std::runtime_error("could not convert Array to std::vector"); } LOG(new_hl_vec.size()); LOG(new_uhl_vec.size()); @@ -448,7 +448,6 @@ void WebViewExampleDlg::promptVarSettings(const json_spirit::Object& req, { using namespace json_spirit; using namespace GdaJson; - using namespace std; VariableSettingsDlg::VarType arity = VariableSettingsDlg::univariate; wxString arity_str = getStrValFromObj(req, "arity"); @@ -493,13 +492,13 @@ void WebViewExampleDlg::promptVarSettings(const json_spirit::Object& req, Object response_obj; - vector var_nms; + std::vector var_nms; var_nms.push_back("var1"); var_nms.push_back("var2"); var_nms.push_back("var3"); var_nms.push_back("var4"); - vector tm_strs; + std::vector tm_strs; table_int->GetTimeStrings(tm_strs); Value tm_strs_val; toValue(tm_strs_val, tm_strs); @@ -520,7 +519,7 @@ void WebViewExampleDlg::promptVarSettings(const json_spirit::Object& req, Value data; b_array_type undefined; table_int->GetColUndefined(col, undefined); - vector f_types = table_int->GetColTypes(col); + std::vector f_types = table_int->GetColTypes(col); if (ft == GdaConst::double_type) { d_array_type d; table_int->GetColData(col, d); diff --git a/GdaCartoDB.cpp b/GdaCartoDB.cpp index 25ab3ab44..8cb4e3e65 100644 --- a/GdaCartoDB.cpp +++ b/GdaCartoDB.cpp @@ -28,8 +28,6 @@ #include "GdaCartoDB.h" -using namespace std; - CartoDBProxy::CartoDBProxy() { user_name = ""; @@ -97,7 +95,7 @@ wxString CartoDBProxy::buildUpdateSQL(const wxString& table_name, const wxString return sql; } -void CartoDBProxy::UpdateColumn(const wxString& table_name, const wxString& col_name, vector& vals) +void CartoDBProxy::UpdateColumn(const wxString& table_name, const wxString& col_name, std::vector& vals) { wxString ss_newtable; for (size_t i=0, n=vals.size(); i& vals) +void CartoDBProxy::UpdateColumn(const wxString& table_name, const wxString& col_name, std::vector& vals) { - ostringstream ss_newtable; + std::ostringstream ss_newtable; ss_newtable.precision(std::numeric_limits::digits10); for (size_t i=0, n=vals.size(); i& vals) +void CartoDBProxy::UpdateColumn(const wxString& table_name, const wxString& col_name, std::vector& vals) { - ostringstream ss_newtable; + std::ostringstream ss_newtable; for (size_t i=0, n=vals.size(); i #include -using namespace std; - class CartoDBProxy { public: @@ -44,15 +42,15 @@ class CartoDBProxy { void UpdateColumn(const wxString& table_name, const wxString& col_name, - vector& vals); + std::vector& vals); void UpdateColumn(const wxString& table_name, const wxString& col_name, - vector& vals); + std::vector& vals); void UpdateColumn(const wxString& table_name, const wxString& col_name, - vector& vals); + std::vector& vals); private: CartoDBProxy(); diff --git a/GdaShape.cpp b/GdaShape.cpp index a9183e18d..1c3babbaa 100644 --- a/GdaShape.cpp +++ b/GdaShape.cpp @@ -2439,7 +2439,6 @@ void GdaShapeTable::Offset(int dx, int dy) void GdaShapeTable::paintSelf(wxDC& dc) { - using namespace std; //LOG_MSG("Entering GdaShapeTable::paintSelf"); if (hidden || vals.size() == 0 || rows*cols != vals.size()) return; dc.SetPen(getPen()); @@ -2450,9 +2449,9 @@ void GdaShapeTable::paintSelf(wxDC& dc) // we know that rows>0 and cols>0 and that rows*cols == vals.size() // let's find the max vertical extent and the max horizontal // extent for each row and each column - vector row_h(rows, 0); - vector col_w(cols, 0); - vector extents(rows*cols); + std::vector row_h(rows, 0); + std::vector col_w(cols, 0); + std::vector extents(rows*cols); for (int i=0; i d(rows*cols); + std::vector d(rows*cols); for (int i=0; i pos(rows*cols); + std::vector pos(rows*cols); int y_offset = 0; for (int i=0; i row_h(rows, 0); - vector col_w(cols, 0); - vector extents(rows*cols); + std::vector row_h(rows, 0); + std::vector col_w(cols, 0); + std::vector extents(rows*cols); for (int i=0; i& date_items) +wxString Gda::DetectDateFormat(wxString s, std::vector& date_items) { // input s could be sth. like: %Y-%m-%d %H:%M:%S // 2015-1-11 13:57:24 %Y-%m-%d %H:%M:%S @@ -212,7 +210,7 @@ wxString Gda::DetectDateFormat(wxString s, vector& date_items) // wxRegEx regex // regex.Compile(pattern); -unsigned long long Gda::DateToNumber(wxString s_date, wxRegEx& regex, vector& date_items) +unsigned long long Gda::DateToNumber(wxString s_date, wxRegEx& regex, std::vector& date_items) { unsigned long long val = 0; @@ -907,17 +905,17 @@ CalculateFromSample(const std::vector& data_, } } -string SampleStatistics::ToString() +std::string SampleStatistics::ToString() { - ostringstream ss; - ss << "sample_size = " << sample_size << endl; - ss << "min = " << min << endl; - ss << "max = " << max << endl; - ss << "mean = " << mean << endl; - ss << "var_with_bessel = " << var_with_bessel << endl; - ss << "var_without_bessel = " << var_without_bessel << endl; - ss << "sd_with_bessel = " << sd_with_bessel << endl; - ss << "sd_without_bessel = " << sd_without_bessel << endl; + std::ostringstream ss; + ss << "sample_size = " << sample_size << std::endl; + ss << "min = " << min << std::endl; + ss << "max = " << max << std::endl; + ss << "mean = " << mean << std::endl; + ss << "var_with_bessel = " << var_with_bessel << std::endl; + ss << "var_without_bessel = " << var_without_bessel << std::endl; + ss << "sd_with_bessel = " << sd_with_bessel << std::endl; + ss << "sd_without_bessel = " << sd_without_bessel << std::endl; return ss.str(); } @@ -1093,18 +1091,18 @@ double SimpleLinearRegression::TScoreTo2SidedPValue(double tscore, int df) } -string SimpleLinearRegression::ToString() +std::string SimpleLinearRegression::ToString() { - ostringstream ss; - ss << "covariance = " << covariance << endl; - ss << "correlation = " << correlation << endl; - ss << "alpha = " << alpha << endl; - ss << "beta = " << beta << endl; - ss << "r_squared = " << r_squared << endl; - ss << "valid = " << (valid ? "true" : "false") << endl; + std::ostringstream ss; + ss << "covariance = " << covariance << std::endl; + ss << "correlation = " << correlation << std::endl; + ss << "alpha = " << alpha << std::endl; + ss << "beta = " << beta << std::endl; + ss << "r_squared = " << r_squared << std::endl; + ss << "valid = " << (valid ? "true" : "false") << std::endl; ss << "valid_correlation = " << (valid_correlation ? "true" : "false") - << endl; - ss << "error_sum_squares = " << error_sum_squares << endl; + << std::endl; + ss << "error_sum_squares = " << error_sum_squares << std::endl; return ss.str(); } @@ -1211,21 +1209,21 @@ void AxisScale::ShowAllTics() for (int i=0; i& x, } } -std::vector GenUtils::rankify(const vector& x) +std::vector GenUtils::rankify(const std::vector& x) { size_t N = x.size(); // Rank Vector @@ -1656,10 +1654,10 @@ std::vector GenUtils::rankify(const vector& x) return Rank_X; } -double GenUtils::RankCorrelation(vector& x, vector& y) +double GenUtils::RankCorrelation(std::vector& x, std::vector& y) { // Get ranks of vector X y - vector rank_x(x.size(), 0), rank_y(y.size(), 0); + std::vector rank_x(x.size(), 0), rank_y(y.size(), 0); boost::thread_group threadPool; threadPool.add_thread(new boost::thread(&GenUtils::rankify_fast, x, boost::ref(rank_x))); threadPool.add_thread(new boost::thread(&GenUtils::rankify_fast, y, boost::ref(rank_y))); @@ -2272,10 +2270,9 @@ bool GenUtils::ExistsShpShxDbf(const wxFileName& fname, bool* shp_found, wxString GenUtils::FindLongestSubString(const std::vector strings, bool cs) { - using namespace std; int n = (int)strings.size(); if (n == 0) return ""; - vector strs(strings); + std::vector strs(strings); if (!cs) for (int i=0; i& colors); + void GetUnique20Colors(std::vector& colors); - void GetLISAColors(vector& colors); - void GetLISAColorLabels(vector& labels); + void GetLISAColors(std::vector& colors); + void GetLISAColorLabels(std::vector& labels); - void GetLocalGColors(vector& colors); - void GetLocalGColorLabels(vector& labels); + void GetLocalGColors(std::vector& colors); + void GetLocalGColorLabels(std::vector& labels); - void GetLocalJoinCountColors(vector& colors); - void GetLocalJoinCountColorLabels(vector& labels); + void GetLocalJoinCountColors(std::vector& colors); + void GetLocalJoinCountColorLabels(std::vector& labels); - void GetLocalGearyColors(vector& colors); - void GetLocalGearyColorLabels(vector& labels); + void GetLocalGearyColors(std::vector& colors); + void GetLocalGearyColorLabels(std::vector& labels); - void GetMultiLocalGearyColors(vector& colors); - void GetMultiLocalGearyColorLabels(vector& labels); + void GetMultiLocalGearyColors(std::vector& colors); + void GetMultiLocalGearyColorLabels(std::vector& labels); - void GetPercentileColors(vector& colors); - void GetPercentileColorLabels(vector& labels); + void GetPercentileColors(std::vector& colors); + void GetPercentileColorLabels(std::vector& labels); - void GetBoxmapColors(vector& colors); - void GetBoxmapColorLabels(vector& labels); + void GetBoxmapColors(std::vector& colors); + void GetBoxmapColorLabels(std::vector& labels); - void GetStddevColors(vector& colors); - void GetStddevColorLabels(vector& labels); + void GetStddevColors(std::vector& colors); + void GetStddevColorLabels(std::vector& labels); - void GetQuantile2Colors(vector& colors); - void GetQuantile3Colors(vector& colors); - void GetQuantile4Colors(vector& colors); - void GetQuantile5Colors(vector& colors); - void GetQuantile6Colors(vector& colors); - void GetQuantile7Colors(vector& colors); - void GetQuantile8Colors(vector& colors); - void GetQuantile9Colors(vector& colors); - void GetQuantile10Colors(vector& colors); + void GetQuantile2Colors(std::vector& colors); + void GetQuantile3Colors(std::vector& colors); + void GetQuantile4Colors(std::vector& colors); + void GetQuantile5Colors(std::vector& colors); + void GetQuantile6Colors(std::vector& colors); + void GetQuantile7Colors(std::vector& colors); + void GetQuantile8Colors(std::vector& colors); + void GetQuantile9Colors(std::vector& colors); + void GetQuantile10Colors(std::vector& colors); } namespace Gda { @@ -139,15 +137,15 @@ namespace Gda { wxString CreateUUID(int nSize); - wxString DetectDateFormat(wxString s, vector& date_items); + wxString DetectDateFormat(wxString s, std::vector& date_items); - unsigned long long DateToNumber(wxString s_date, wxRegEx& regex, vector& date_items); + unsigned long long DateToNumber(wxString s_date, wxRegEx& regex, std::vector& date_items); // useful for sorting a vector of double with their original indexes: - // vector data; + // std::vector data; // sort(data.begin(), data.end(), Gda::dbl_int_pair_cmp_less); - typedef pair dbl_int_pair_type; - typedef vector dbl_int_pair_vec_type; + typedef std::pair dbl_int_pair_type; + typedef std::vector dbl_int_pair_vec_type; bool dbl_int_pair_cmp_less(const dbl_int_pair_type& ind1, const dbl_int_pair_type& ind2); bool dbl_int_pair_cmp_greater(const dbl_int_pair_type& ind1, @@ -156,18 +154,18 @@ namespace Gda { const dbl_int_pair_type& ind2); bool dbl_int_pair_cmp_second_greater(const dbl_int_pair_type& ind1, const dbl_int_pair_type& ind2); - typedef pair str_int_pair_type; - typedef vector str_int_pair_vec_type; + typedef std::pair str_int_pair_type; + typedef std::vector str_int_pair_vec_type; // Percentile using Linear interpolation between closest ranks // Definition as described in Matlab documentation // and at http://en.wikipedia.org/wiki/Percentile // Assumes that input vector v is sorted in ascending order. // Duplicate values are allowed. - double percentile(double x, const vector& v); + double percentile(double x, const std::vector& v); double percentile(double x, const Gda::dbl_int_pair_vec_type& v); double percentile(double x, const Gda::dbl_int_pair_vec_type& v, - const vector& undefs); + const std::vector& undefs); } // Note: In "Exploratory Data Analysis", pp 32-34, 1977, Tukey only defines @@ -214,9 +212,9 @@ struct HingeStats { max_val(0), is_even_num_obs(false), Q2(0), Q2_ind(0), Q1(0), Q1_ind(0), Q3(0), Q3_ind(0), min_IQR_ind(0), max_IQR_ind(0) {} - void CalculateHingeStats(const vector& data); - void CalculateHingeStats(const vector& data, - const vector& data_undef); + void CalculateHingeStats(const std::vector& data); + void CalculateHingeStats(const std::vector& data, + const std::vector& data_undef); int num_obs; double min_val; double max_val; @@ -242,19 +240,19 @@ struct HingeStats { struct SampleStatistics { SampleStatistics(); - SampleStatistics(const vector& data); - SampleStatistics(const vector& data, - const vector& undefs); - SampleStatistics(const vector& data, - const vector& undefs1, - const vector& undefs2); - void CalculateFromSample(const vector& data); - void CalculateFromSample(const vector& data, - const vector& undefs); - void CalculateFromSample(const vector& data, - const vector& undefs); + SampleStatistics(const std::vector& data); + SampleStatistics(const std::vector& data, + const std::vector& undefs); + SampleStatistics(const std::vector& data, + const std::vector& undefs1, + const std::vector& undefs2); + void CalculateFromSample(const std::vector& data); + void CalculateFromSample(const std::vector& data, + const std::vector& undefs); + void CalculateFromSample(const std::vector& data, + const std::vector& undefs); - string ToString(); + std::string ToString(); int sample_size; double min; @@ -265,12 +263,12 @@ struct SampleStatistics { double sd_with_bessel; double sd_without_bessel; - static double CalcMin(const vector& data); - static double CalcMax(const vector& data); - static void CalcMinMax(const vector& data, double& min, + static double CalcMin(const std::vector& data); + static double CalcMax(const std::vector& data); + static void CalcMinMax(const std::vector& data, double& min, double& max); - static double CalcMean(const vector& data); - static double CalcMean(const vector& data); + static double CalcMean(const std::vector& data); + static double CalcMean(const std::vector& data); }; @@ -282,26 +280,26 @@ struct SimpleLinearRegression { valid(false), valid_correlation(false), valid_std_err(false) {} - SimpleLinearRegression(const vector& X, - const vector& Y, + SimpleLinearRegression(const std::vector& X, + const std::vector& Y, double meanX, double meanY, double varX, double varY); - SimpleLinearRegression(const vector& X, - const vector& Y, - const vector& X_undef, - const vector& Y_undef, + SimpleLinearRegression(const std::vector& X, + const std::vector& Y, + const std::vector& X_undef, + const std::vector& Y_undef, double meanX, double meanY, double varX, double varY); - void CalculateRegression(const vector& X, - const vector& Y, + void CalculateRegression(const std::vector& X, + const std::vector& Y, double meanX, double meanY, double varX, double varY); static double TScoreTo2SidedPValue(double tscore, int df); - string ToString(); + std::string ToString(); int n; double covariance; @@ -332,7 +330,7 @@ struct AxisScale { const int ticks = 5); void SkipEvenTics(); // only display every other tic value void ShowAllTics(); - string ToString(); + std::string ToString(); double data_min; double data_max; @@ -344,9 +342,9 @@ struct AxisScale { bool lbl_prec_fixed_point; int ticks; int p; // power of ten to scale significant digit - vectortics; // numerical tic values - vectortics_str; // tics in formated string representation - vectortics_str_show; // if false, then don't draw tic string + std::vectortics; // numerical tic values + std::vectortics_str; // tics in formated string representation + std::vectortics_str_show; // if false, then don't draw tic string }; @@ -360,47 +358,47 @@ namespace GenUtils { wxString IntToStr(int x, int precision = 0); wxString PtToStr(const wxPoint& p); wxString PtToStr(const wxRealPoint& p); - void Transformation(int trans_type, vector >& data, - vector >& undef); + void Transformation(int trans_type, std::vector >& data, + std::vector >& undef); void MeanAbsoluteDeviation(int nObs, double* data); - void MeanAbsoluteDeviation(int nObs, double* data, vector& undef); - void MeanAbsoluteDeviation(vector& data); - void MeanAbsoluteDeviation(vector& data, vector& undef); + void MeanAbsoluteDeviation(int nObs, double* data, std::vector& undef); + void MeanAbsoluteDeviation(std::vector& data); + void MeanAbsoluteDeviation(std::vector& data, std::vector& undef); void DeviationFromMean(int nObs, double* data); - void DeviationFromMean(int nObs, double* data, vector& undef); + void DeviationFromMean(int nObs, double* data, std::vector& undef); void DeviationFromMean(std::vector& data, std::vector& undef); - void DeviationFromMean(vector& data); - void DeviationFromMedian(vector& data); - void DeviationFromMedoid(vector& data, double medoid_val); + void DeviationFromMean(std::vector& data); + void DeviationFromMedian(std::vector& data); + void DeviationFromMedoid(std::vector& data, double medoid_val); - double Sum(vector& data); + double Sum(std::vector& data); double Median(std::vector& data); double Median(double* data, int n, const std::vector& undefs); - double SumOfSquares(vector& data); - double SumOfSquaresMedian(vector& data); - double SumOfSquaresMedoid(vector& data, double medoid_val); + double SumOfSquares(std::vector& data); + double SumOfSquaresMedian(std::vector& data); + double SumOfSquaresMedoid(std::vector& data, double medoid_val); - double SumOfManhattanMedian(vector& data); - double SumOfManhattanMedoid(vector& data, double medoid_val); + double SumOfManhattanMedian(std::vector& data); + double SumOfManhattanMedoid(std::vector& data, double medoid_val); bool StandardizeData(int nObs, double* data); - bool StandardizeData(int nObs, double* data, vector& undef); - bool StandardizeData(vector& data); - bool StandardizeData(vector& data, vector& undef); + bool StandardizeData(int nObs, double* data, std::vector& undef); + bool StandardizeData(std::vector& data); + bool StandardizeData(std::vector& data, std::vector& undef); void RangeAdjust(std::vector& data); void RangeAdjust(std::vector& data, std::vector& undef); void RangeStandardize(std::vector& data); void RangeStandardize(std::vector& data, std::vector& undef); - std::vector rankify(const vector& x); - void rankify_fast(const vector& x, std::vector& Rank_X); - double RankCorrelation(vector& x, vector& y); - double Correlation(vector& x, vector& y); - double GetVariance(vector& data); + std::vector rankify(const std::vector& x); + void rankify_fast(const std::vector& x, std::vector& Rank_X); + double RankCorrelation(std::vector& x, std::vector& y); + double Correlation(std::vector& x, std::vector& y); + double GetVariance(std::vector& data); wxString swapExtension(const wxString& fname, const wxString& ext); wxString GetFileDirectory(const wxString& path); wxString GetFileName(const wxString& path); @@ -423,12 +421,12 @@ namespace GenUtils { by SimplfyPath to see if they can be converted into a relative path with respect to the current Working Directory (project file location). */ wxString SimplifyPath(const wxFileName& wd, const wxString& path); - void SplitLongPath(const wxString& path, vector& parts, + void SplitLongPath(const wxString& path, std::vector& parts, wxString& html_formatted, int max_chars_per_part = 30); wxInt32 Reverse(const wxInt32 &val); long ReverseInt(const int &val); - void SkipTillNumber(istream &s); + void SkipTillNumber(std::istream &s); void longToString(const long d, char* Id, const int base); double distance(const wxRealPoint& p1, const wxRealPoint& p2); double distance(const wxRealPoint& p1, const wxPoint& p2); @@ -448,7 +446,7 @@ namespace GenUtils { bool isEmptyOrSpaces(const wxString& str); bool ExistsShpShxDbf(const wxFileName& fname, bool* shp_found, bool* shx_found, bool* dbf_found); - wxString FindLongestSubString(const vector strings, + wxString FindLongestSubString(const std::vector strings, bool case_sensitive=false); wxString WrapText(wxWindow *win, const wxString& text, int widthMax); wxString GetExeDir(); @@ -462,7 +460,7 @@ namespace GenUtils { wxString GetLangConfigPath(); wxString GetLoggerPath(); - bool less_vectors(const vector& a,const vector& b); + bool less_vectors(const std::vector& a,const std::vector& b); bool smaller_pair(const std::pair& a, const std::pair& b); @@ -474,9 +472,9 @@ namespace GenUtils { // index_map an index map such that sorted[i] = unsorted[index_map[i]] template void sort( - vector &unsorted, - vector &sorted, - vector &index_map); + std::vector &unsorted, + std::vector &sorted, + std::vector &index_map); // Act like matlab's Y = X[I] // where I contains a vector of indices so that after, // Y[j] = X[I[j]] for index j @@ -484,9 +482,9 @@ namespace GenUtils { // X and Y are allowed to be the same reference template< class T > void reorder( - vector & unordered, - vector const & index_map, - vector & ordered); + std::vector & unordered, + std::vector const & index_map, + std::vector & ordered); // Comparison struct used by sort // http://bytes.com/topic/c/answers/132045-sort-get-index @@ -502,9 +500,9 @@ namespace GenUtils { template void sort( - vector & unsorted, - vector & sorted, - vector & index_map) + std::vector & unsorted, + std::vector & sorted, + std::vector & index_map) { // Original unsorted index map index_map.resize(unsorted.size()); @@ -516,7 +514,7 @@ namespace GenUtils { sort( index_map.begin(), index_map.end(), - index_cmp& >(unsorted)); + index_cmp& >(unsorted)); sorted.resize(unsorted.size()); reorder(unsorted,index_map,sorted); @@ -524,13 +522,13 @@ namespace GenUtils { // This implementation is O(n), but also uses O(n) extra memory template< class T > void reorder( - vector & unordered, - vector const & index_map, - vector & ordered) + std::vector & unordered, + std::vector const & index_map, + std::vector & ordered) { // copy for the reorder according to index_map, because unsorted may also be // sorted - vector copy = unordered; + std::vector copy = unordered; ordered.resize(index_map.size()); for(int i = 0; iDelete(items[i]); } if (project_p) { - vector titles; + std::vector titles; CatClassifManager* ccm = project_p->GetCatClassifManager(); ccm->GetTitles(titles); @@ -1136,7 +1136,7 @@ void GdaFrame::OnCustomCategoryClick(wxCommandEvent& event) if (project_p) { CatClassifManager* ccm = project_p->GetCatClassifManager(); if (!ccm) return; - vector titles; + std::vector titles; ccm->GetTitles(titles); int idx = xrc_id - GdaConst::ID_CUSTOM_CAT_CLASSIF_CHOICE_A0; @@ -1175,7 +1175,7 @@ void GdaFrame::OnEmptyCustomCategoryClick(wxCommandEvent& event) if (project_p) { CatClassifManager* ccm = project_p->GetCatClassifManager(); if (!ccm) return; - vector titles; + std::vector titles; ccm->GetTitles(titles); int idx = xrc_id - GdaConst::ID_CUSTOM_CAT_CLASSIF_CHOICE_A0; @@ -2321,7 +2321,7 @@ void GdaFrame::OnMapChoices(wxCommandEvent& event) for (int i=0; iDelete(items[i]); } - vector titles; + std::vector titles; CatClassifManager* ccm = project_p->GetCatClassifManager(); ccm->GetTitles(titles); @@ -2798,7 +2798,7 @@ void GdaFrame::OnExportSelectedToOGR(wxCommandEvent& event) { if (!project_p || !project_p->GetTableInt()) return; - vector selected_rows; + std::vector selected_rows; project_p->GetSelectedRows(selected_rows); if ( selected_rows.empty() ) { wxMessageDialog dlg (this, @@ -4352,7 +4352,7 @@ void GdaFrame::OnOpenBivariateLJC(wxCommandEvent& event) { int num_obs = p->GetNumRecords(); - vector undefs; + std::vector undefs; for (int i=0; iGetNumRecords(); if (p->GetTimeState()) t = p->GetTimeState()->GetCurrTime(); - vector local_t; + std::vector local_t; for (int v=0; v undefs; + std::vector undefs; for (int i=0; iGetCatClassifManager(); if (!ccm) return; - vector titles; + std::vector titles; ccm->GetTitles(titles); int idx = xrc_id - GdaConst::ID_CUSTOM_CAT_CLASSIF_CHOICE_B0; @@ -4707,7 +4707,7 @@ void GdaFrame::OnCustomCategoryClick_C(wxCommandEvent& event) if (project_p) { CatClassifManager* ccm = project_p->GetCatClassifManager(); if (!ccm) return; - vector titles; + std::vector titles; ccm->GetTitles(titles); int idx = xrc_id - GdaConst::ID_CUSTOM_CAT_CLASSIF_CHOICE_C0; diff --git a/GeoDamake.opt b/GeoDamake.opt index 7f13b2867..101b28902 100644 --- a/GeoDamake.opt +++ b/GeoDamake.opt @@ -2,35 +2,38 @@ GeoDa_ROOT = $(GEODA_HOME)/../.. TARGET = GeoDa -CC = gcc -CXX = g++ -LD = g++ +CC = /usr/bin/gcc +CXX = /usr/bin/g++ +LD = /usr/bin/g++ RM = /bin/rm -f -WXLIBS = $(shell $(GEODA_HOME)/libraries/bin/wx-config --libs xrc,stc,richtext,ribbon,propgrid,aui,gl,html,qa,adv,core,xml,webview,net,base) +WXLIBS = $(shell $(GEODA_HOME)/libraries/bin/wx-config --libs xrc,stc,richtext,ribbon,propgrid,aui,gl,html,webview,qa,adv,core,xml,net,base) WX_HEADER = $(shell $(GEODA_HOME)/libraries/bin/wx-config --cppflags) -LIBS = $(WXLIBS) \ - $(GEODA_HOME)/temp/CLAPACK-3.2.1/blas.a \ - $(GEODA_HOME)/temp/CLAPACK-3.2.1/F2CLIBS/libf2c.a \ - $(GEODA_HOME)/temp/CLAPACK-3.2.1/lapack.a \ - -L/usr/lib -liconv -lcurl -lz -lpthread \ - -framework OpenCL \ - -L/usr/local/opt/gdal/lib -lgdal \ - /usr/local/opt/boost/lib/libboost_date_time-mt.a \ - /usr/local/opt/boost/lib/libboost_thread-mt.a \ - /usr/local/opt/boost/lib/libboost_system-mt.a \ - $(GEODA_HOME)/libraries/lib/libjson_spirit.a +LIBS = $(WXLIBS) \ + $(GEODA_HOME)/temp/CLAPACK-3.2.1/lapack.a \ + $(GEODA_HOME)/temp/CLAPACK-3.2.1/libf2c.a \ + $(GEODA_HOME)/temp/CLAPACK-3.2.1/blas.a \ + $(GEODA_HOME)/temp/boost/stage/lib/libboost_date_time.a \ + $(GEODA_HOME)/temp/boost/stage/lib/libboost_thread.a \ + $(GEODA_HOME)/temp/boost/stage/lib/libboost_system.a \ + $(GEODA_HOME)/libraries/lib/libjson_spirit.a \ + -L$(GEODA_HOME)/libraries/lib -lgdal -lcurl -L/usr/lib/x86_64-linux-gnu -lz -lwebkit2gtk-4.0 -lEGL -ljavascriptcoregtk-4.0 +# Note: Library -lrtmp causes a missing library problem at runtime on +# Ubuntu 14.10 and later. +BOOST_HEADER = -I$(GEODA_HOME)/temp/boost -BOOST_HEADER = -I/usr/local/opt/boost/include -GDAL_HEADER = -I/usr/local/opt/gdal/include -D__PROJ6__ -EIGEN_HEADER = -I$(GEODA_HOME)/libraries/include -I$(GEODA_HOME)/temp/eigen3 -I$(GEODA_HOME)/temp/spectra/include +EIGEN_HEADER = -I$(GEODA_HOME)/temp/eigen3 -I$(GEODA_HOME)/temp/spectra/include -CPPFLAGS = -arch arm64 -O3 -std=c++14 -I$(GeoDa_ROOT) $(USER_LOG) $(GDAL_HEADER) $(EIGEN_HEADER) -CFLAGS = -arch arm64 -O3 -Wall -Wdeclaration-after-statement $(USER_DEFS) $(GDAL_HEADER) $(EIGEN_HEADER) -CXXFLAGS = -arch arm64 -std=c++14 -O3 -Wall $(USER_DEFS) $(WX_HEADER) $(BOOST_HEADER) $(GDAL_HEADER) $(EIGEN_HEADER) -LDFLAGS = -arch arm64 +GDAL_HEADER = -I/usr/include/gdal -D__PROJ6__ + +USER_DEFS = -I$(GEODA_HOME)/libraries/include + +CPPFLAGS = -std=gnu++14 -I$(GeoDa_ROOT) +CFLAGS = -O2 -Wdeclaration-after-statement $(USER_DEFS) $(GDAL_HEADER) $(EIGEN_HEADER) +CXXFLAGS = -std=gnu++14 -O2 $(USER_DEFS) $(WX_HEADER) $(BOOST_HEADER) $(GDAL_HEADER) $(EIGEN_HEADER) +LDFLAGS = OBJ_EXT = o @@ -53,13 +56,13 @@ T_OBJ = $(foreach file,$(OBJ),o/$(file)) $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $< o/%.$(OBJ_EXT): %.c - $(CC) $(CFLAGS) -c -o $@ $< + $(CC) $(CFLAGS) -c -o $@ $< o/%.$(OBJ_EXT): %.cpp $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $< %.$(OBJ_EXT): %.c - $(CC) $(CFLAGS) -c -o $@ $< + $(CC) $(CFLAGS) -c -o $@ $< %.$(OBJ_EXT): %.cpp $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $< diff --git a/Project.cpp b/Project.cpp index 63bb1b56d..cf7132028 100644 --- a/Project.cpp +++ b/Project.cpp @@ -211,7 +211,7 @@ Project::~Project() } // clean multi-layers, the actual memory - map::iterator it; + std::map::iterator it; for (it=bg_maps.begin(); it!=bg_maps.end(); it++) { BackgroundMapLayer* ml = it->second; ml->CleanMemory(); @@ -343,7 +343,7 @@ Shapefile::ShapeType Project::GetShapefileType() return shape_type; } -Shapefile::ShapeType Project::GetGdaGeometries(vector& geometries) +Shapefile::ShapeType Project::GetGdaGeometries(std::vector& geometries) { wxLogMessage("Project::GetGdaGeometries()"); Shapefile::ShapeType shape_type = Shapefile::NULL_SHAPE; @@ -612,7 +612,7 @@ void Project::SaveDataSourceAs(const wxString& new_ds_name, bool is_update) wxLogMessage("Entering Project::SaveDataSourceAs"); wxLogMessage("New Datasource Name:" + new_ds_name); - vector geometries; + std::vector geometries; try { // SaveAs only to same datasource GdaConst::DataSourceType ds_type = datasource->GetType(); @@ -637,13 +637,13 @@ void Project::SaveDataSourceAs(const wxString& new_ds_name, bool is_update) Shapefile::ShapeType shape_type = GetGdaGeometries(geometries); // Get default selected rows: all records should be saved or saveas - vector selected_rows; + std::vector selected_rows; for (size_t i=0; iGetNumberRows(); i++) { selected_rows.push_back(i); } // Create in-memory OGR geometries - vector ogr_geometries; + std::vector ogr_geometries; OGRwkbGeometryType geom_type; geom_type = ogr_adapter.MakeOGRGeometries(geometries, shape_type, ogr_geometries, selected_rows); @@ -1001,11 +1001,11 @@ TableBase* Project::FindTableBase() return NULL; } -void Project::GetSelectedRows(vector& rowids) +void Project::GetSelectedRows(std::vector& rowids) { rowids.clear(); int n_rows = GetNumRecords(); - vector& hs = highlight_state->GetHighlight(); + std::vector& hs = highlight_state->GetHighlight(); for ( int i=0; i Project::GetBackgroundMayLayers() +std::map Project::GetBackgroundMayLayers() { return bg_maps; } -void Project::SetBackgroundMayLayers(map& val) +void Project::SetBackgroundMayLayers(std::map& val) { bg_maps = val; } -map Project::GetForegroundMayLayers() +std::map Project::GetForegroundMayLayers() { return fg_maps; } -void Project::SetForegroundMayLayers(map& val) +void Project::SetForegroundMayLayers(std::map& val) { fg_maps = val; } -vector Project::CloneBackgroundMaps(bool clone_style) +std::vector Project::CloneBackgroundMaps(bool clone_style) { - vector copy_bg_maps; - map::iterator it; + std::vector copy_bg_maps; + std::map::iterator it; for (it=bg_maps.begin(); it!=bg_maps.end(); it++) { wxString name = it->first; BackgroundMapLayer* ml = it->second; @@ -1805,10 +1805,10 @@ vector Project::CloneBackgroundMaps(bool clone_style) return copy_bg_maps; } -map Project::CloneForegroundMaps(bool clone_style) +std::map Project::CloneForegroundMaps(bool clone_style) { - map copy_fg_maps; - map::iterator it; + std::map copy_fg_maps; + std::map::iterator it; for (it=fg_maps.begin(); it!=fg_maps.end(); it++) { wxString name = it->first; BackgroundMapLayer* ml = it->second; @@ -1829,10 +1829,10 @@ BackgroundMapLayer* Project::GetMapLayer(wxString map_name) return ml; } -vector Project::GetLayerNames() +std::vector Project::GetLayerNames() { - vector names; - map::iterator it; + std::vector names; + std::map::iterator it; for (it=fg_maps.begin(); it!=fg_maps.end(); it++) { wxString name = it->first; names.push_back(name); @@ -1861,7 +1861,7 @@ void Project::RemoveLayer(wxString name) } } -bool Project::GetStringColumnData(wxString field_name, vector& data) +bool Project::GetStringColumnData(wxString field_name, std::vector& data) { if (data.empty()) { data.resize(num_records); @@ -1882,7 +1882,7 @@ bool Project::GetStringColumnData(wxString field_name, vector& data) return false; } -vector Project::GetIntegerAndStringFieldNames() +std::vector Project::GetIntegerAndStringFieldNames() { return layer_proxy->GetIntegerAndStringFieldNames(); } diff --git a/Project.h b/Project.h index 8e7f27565..077b312aa 100644 --- a/Project.h +++ b/Project.h @@ -149,7 +149,7 @@ class Project { bool CheckSpatialProjection(bool& check_again, bool is_arc=false); OGRLayerProxy* GetOGRLayerProxy() {return layer_proxy;} /** Save in-memory Table+Geometries to OGR DataSource */ - Shapefile::ShapeType GetGdaGeometries(vector& geometries); + Shapefile::ShapeType GetGdaGeometries(std::vector& geometries); Shapefile::ShapeType GetShapefileType(); void AddNeighborsToSelection(boost::uuids::uuid weights_id); @@ -163,7 +163,7 @@ class Project { GalElement* GetVoronoiRookNeighborGal(); void AddMeanCenters(); void AddCentroids(); - void GetSelectedRows(vector& rowids); + void GetSelectedRows(std::vector& rowids); /// centroids by default const std::vector& GetMeanCenters(); @@ -188,25 +188,25 @@ class Project { rtree_pt_3d_t& GetUnitSphereRtree(); // for multi-layer - map bg_maps; - map fg_maps; + std::map bg_maps; + std::map fg_maps; BackgroundMapLayer* AddMapLayer(wxString datasource_name, GdaConst::DataSourceType ds_type, wxString layer_name); - void SetForegroundMayLayers(map& val); - void SetBackgroundMayLayers(map& val); - map GetBackgroundMayLayers(); - map GetForegroundMayLayers(); + void SetForegroundMayLayers(std::map& val); + void SetBackgroundMayLayers(std::map& val); + std::map GetBackgroundMayLayers(); + std::map GetForegroundMayLayers(); int GetMapLayerCount(); // clone all except shapes and geoms, which are owned by Project* instance; // so that different map window can configure the multi-layers - vector CloneBackgroundMaps(bool clone_style=false); - map CloneForegroundMaps(bool clone_style=false); + std::vector CloneBackgroundMaps(bool clone_style=false); + std::map CloneForegroundMaps(bool clone_style=false); BackgroundMapLayer* GetMapLayer(wxString map_name); - vector GetLayerNames(); + std::vector GetLayerNames(); void RemoveLayer(wxString name); - bool GetStringColumnData(wxString field_name, vector& data); - vector GetIntegerAndStringFieldNames(); + bool GetStringColumnData(wxString field_name, std::vector& data); + std::vector GetIntegerAndStringFieldNames(); // default variables wxString GetDefaultVarName(int var); diff --git a/ProjectConf.cpp b/ProjectConf.cpp index aed2638bd..3de526307 100644 --- a/ProjectConf.cpp +++ b/ProjectConf.cpp @@ -27,7 +27,6 @@ #include "GdaException.h" using boost::property_tree::ptree; -using namespace std; //------------------------------------------------------------------------------ // LayerConfiguration member functions @@ -92,7 +91,7 @@ void LayerConfiguration::ReadPtree(const ptree& pt, // create DataSource instance from ... const ptree& subtree = pt.get_child("datasource"); - string type_str = subtree.get("type"); + std::string type_str = subtree.get("type"); datasource = IDataSource::CreateDataSource(type_str, subtree, proj_path); wxString tmp1(pt.get("layername", "").c_str(), wxConvUTF8); diff --git a/Regression/ML_im.cpp b/Regression/ML_im.cpp index 4b6127fb2..f6f864e77 100644 --- a/Regression/ML_im.cpp +++ b/Regression/ML_im.cpp @@ -1719,7 +1719,7 @@ VALUE ECL(WVector & resid, WVector & residW, const VALUE rho, const double* wr ji = -rho * (ji * (1.0 - rho * wr[cnt]) + wi[cnt] * (1.0 - rho * jr)); } jr = log(jr); -cout << ji << endl; +cout << ji << std::endl; WVector tmp; tmp.reset(); tmp.copy(residW()); // copy residiual of wy on X @@ -1896,7 +1896,7 @@ double SmallSimulationLag(Weights &W, // eigenvalues are in s // good and nothing else to do in this step } else { - cerr << "error in computing eigenvalues" << endl; + cerr << "error in computing eigenvalues" << std::endl; // wxMessageBox("error in computing eigenvalues"; return -1; } @@ -1931,7 +1931,7 @@ double SmallSimulationLag(Weights &W, // eigenvalues are in wr and wi // good and nothing else to do in this step } else { - cerr << "error in computing eigenvalues" << endl; + cerr << "error in computing eigenvalues" << std::endl; // wxMessageBox("error in computing eigenvalues"; return -1; } @@ -2115,7 +2115,7 @@ VALUE SmallErrorLogLikelihood(Iterator X, ji = -lambda * (ji * (1.0 - lambda * wr[cnt]) + wi[cnt] * (1.0 - lambda * jr)); } jr = log(jr); -cout << ji << endl; +cout << ji << std::endl; WMatrix XminusLambdaLagX(X.count()); WVector YminusLambdaLagY(y.count()); @@ -2358,7 +2358,7 @@ double SmallSimulationError(Weights &W, // eigenvalues are in s // good and nothing else to do in this step } else { - cerr << "error in computing eigenvalues" << endl; + cerr << "error in computing eigenvalues" << std::endl; wxMessageBox("Error: There was an error computing eigenvalues."); return -1; } @@ -2393,7 +2393,7 @@ double SmallSimulationError(Weights &W, // eigenvalues are in wr and wi // good and nothing else to do in this step } else { - cerr << "error in computing eigenvalues" << endl; + cerr << "error in computing eigenvalues" << std::endl; wxMessageBox("Error: There was an error computing eigenvalues."); return -1; } diff --git a/Regression/SparseMatrix.cpp b/Regression/SparseMatrix.cpp index de3a5ebac..f377aecd6 100644 --- a/Regression/SparseMatrix.cpp +++ b/Regression/SparseMatrix.cpp @@ -58,7 +58,7 @@ SparseMatrix::SparseMatrix(const GalElement *my_gal, int obs) void SparseMatrix::createGAL(const GalElement* my_gal, int obs) { // get the weights from GAL file int dim = obs; - typedef pair Map; + typedef std::pair Map; Map * key = new Map [ dim ]; @@ -200,9 +200,8 @@ void SparseMatrix::IminusRhoThis( const double rho, const DenseVector &column, void SparseMatrix::WtTimesColumn(DenseVector &wtx, const DenseVector &x) { - using namespace std; MakeTranspose(); - typedef list< pair >::iterator l_itr_t; + typedef list< std::pair >::iterator l_itr_t; for (int i=0; i mt, INDEX &start, INDEX &Contig, order[init]= 0; // mark the last element if (pieces == 1) { // find element with min degree init= Dim1; -// cout << "ordering " << setw(4) << mt.count() << " elts, conty: " << setw(4) << conty << " has " << last-first << endl; +// cout << "ordering " << std::setw(4) << mt.count() << " elts, conty: " << std::setw(4) << conty << " has " << last-first << std::endl; for (current= first; current < last; ++current) { INDEX cnt= mt[*current].count(); if (cnt < init) { init= cnt; next= current; }; @@ -571,7 +571,7 @@ void PolyOrganize(const WVector * First, const INDEX Precision, Iterator mt, INDEX Pseudo, INDEX & Second, INDEX & Pseu LevelStructure(mt, Pseudo, localLevel, perm(), order.first()); } while (oldPseudo == 0); -// cout << " psF: " << Pseudo << " levelF: " << Level << endl; +// cout << " psF: " << Pseudo << " levelF: " << Level << std::endl; VALUE OpBest= dim * geoda_sqr((double) dim), OpLevel; for (INDEX lev= 1; lev < localLevel-1; ++lev) { @@ -828,7 +828,7 @@ VALUE OnePoly(Iterator Poly, const VALUE Val, const INDEX Prec, INDEX P S += *itr * *Po; if (S < 1.0e-16) { if (first) { -// cout << " S is small= " << S << " val: " << Val << endl; +// std::cout << " S is small= " << S << " val: " << Val << std::endl; first= false; }; S= 1.0e-16; diff --git a/Regression/smile2.cpp b/Regression/smile2.cpp index 1163da4f0..e80e58e26 100644 --- a/Regression/smile2.cpp +++ b/Regression/smile2.cpp @@ -396,9 +396,9 @@ double Compute_MoranZ(GalElement* g, // Note: following map can be either std::map or boost::unordered_map // unordered map is a hash table but has slower iterator access, while // map is a tree but has a fast iterator. - vector< boost::unordered_map > W_map(n); // W - vector< boost::unordered_map > Wt_map(n); // W' - vector< map > B(n); // union of pattern of non-zeros in W and W' + std::vector< boost::unordered_map > W_map(n); // W + std::vector< boost::unordered_map > Wt_map(n); // W' + std::vector< std::map > B(n); // union of pattern of non-zeros in W and W' for (int i=0; i::iterator it; - for (map::iterator B_it = B[i].begin(); + for (std::map::iterator B_it = B[i].begin(); B_it != B[i].end(); ++B_it) { int j = B_it->first; it = W_map[i].find(j); diff --git a/ShapeOperations/CsvFileUtils.cpp b/ShapeOperations/CsvFileUtils.cpp index e51b4fb4a..3e6a05948 100644 --- a/ShapeOperations/CsvFileUtils.cpp +++ b/ShapeOperations/CsvFileUtils.cpp @@ -37,13 +37,12 @@ void Gda::StringsToCsvRecord(const std::vector& strings, std::string& record) { - using namespace std; - vector escaped_strs(strings.size()); + std::vector escaped_strs(strings.size()); for (int i=0, iend=strings.size(); i& strings, } } - ostringstream ss; + std::ostringstream ss; for (int i=0, iend=escaped_strs.size(); i& first_row, wxString& err_msg) { - using namespace std; - - ifstream file(csv_fname.c_str()); + std::ifstream file(csv_fname.c_str()); if (!file.is_open()) { err_msg << "Unable to open CSV file."; return false; } - typedef Gda::csv_record_grammar csv_rec_gram; + typedef Gda::csv_record_grammar csv_rec_gram; csv_rec_gram csv_record; // CSV grammar instance using boost::spirit::ascii::space; - string line; + std::string line; num_rows = 0; num_cols = 0; first_row.clear(); @@ -127,8 +124,8 @@ bool Gda::GetCsvStats(const std::string& csv_fname, file.close(); return false; } else { - string::const_iterator iter = line.begin(); - string::const_iterator end = line.end(); + std::string::const_iterator iter = line.begin(); + std::string::const_iterator end = line.end(); bool r = phrase_parse(iter, end, csv_record, space, first_row); if (!r || iter != end) { err_msg << "Problem parsing first line of CSV."; @@ -158,7 +155,6 @@ bool Gda::FillStringTableFromCsv(const std::string& csv_fname, bool first_row_field_names, wxString& err_msg) { - using namespace std; wxStopWatch sw; int num_rows = 0; @@ -175,19 +171,19 @@ bool Gda::FillStringTableFromCsv(const std::string& csv_fname, string_table.resize(boost::extents[num_rows][num_cols]); - ifstream file(csv_fname.c_str()); + std::ifstream file(csv_fname.c_str()); if (!file.is_open()) { - //cout << "Error: unable to open CSV file." << endl; + //cout << "Error: unable to open CSV file." << std::endl; return false; } - vector v; - typedef Gda::csv_record_grammar csv_rec_gram; + std::vector v; + typedef Gda::csv_record_grammar csv_rec_gram; csv_rec_gram csv_record; // CSV grammar instance using boost::spirit::ascii::space; int row = 0; - string line; + std::string line; // skip first row if these are field names if (first_row_field_names) Gda::safeGetline(file, line); bool done = false; @@ -196,8 +192,8 @@ bool Gda::FillStringTableFromCsv(const std::string& csv_fname, Gda::safeGetline(file, line); if (!line.empty()) { v.clear(); - string::const_iterator iter = line.begin(); - string::const_iterator end = line.end(); + std::string::const_iterator iter = line.begin(); + std::string::const_iterator end = line.end(); bool r = phrase_parse(iter, end, csv_record, space, v); if (!r || iter != end) { @@ -237,7 +233,6 @@ bool Gda::ConvertColToLongs(const std_str_array_type& string_table, std::vector& undef, int& failed_index) { - using namespace std; using boost::lexical_cast; using boost::bad_lexical_cast; @@ -248,7 +243,7 @@ bool Gda::ConvertColToLongs(const std_str_array_type& string_table, undef.resize(num_rows); for (int i=0; i& undef, int& failed_index) { - using namespace std; using boost::lexical_cast; using boost::bad_lexical_cast; @@ -282,7 +276,7 @@ bool Gda::ConvertColToDoubles(const std_str_array_type& string_table, undef.resize(num_rows); for (int i=0; i nnbrs_array; + std::vector nnbrs_array; std::map e_dict; for (int i=0; i& stack_ids, const wxString& ofname) { - using namespace std; if (!project || ofname.empty()) return false; WeightsManInterface* wmi = project->GetWManInt(); @@ -435,7 +434,7 @@ bool GalWeight::SaveDIDWeights(Project* project, int num_obs, int n = newids.size(); - ofstream out; + std::ofstream out; out.open(GET_ENCODED_FILENAME(ofname)); if (!(out.is_open() && out.good())) return false; @@ -447,7 +446,7 @@ bool GalWeight::SaveDIDWeights(Project* project, int num_obs, wxString id_var_name("STID"); out << "0 " << n << " " << layer_name; - out << " " << id_var_name << endl; + out << " " << id_var_name << std::endl; int offset = 0; @@ -459,14 +458,14 @@ bool GalWeight::SaveDIDWeights(Project* project, int num_obs, } out << newids[i]; - out << " " << gal[orig_id].Size() << endl; + out << " " << gal[orig_id].Size() << std::endl; for (int cp=gal[orig_id].Size(); --cp >= 0;) { int n_id = gal[orig_id][cp]; out << n_id + offset + 1; // n_id starts from 0, so add 1 if (cp > 0) out << " "; } - out << endl; + out << std::endl; } return true; } @@ -475,8 +474,6 @@ bool GalWeight::SaveSpaceTimeWeights(const wxString& ofname, WeightsManInterface* wmi, TableInterface* table_int) { - using namespace std; - if (ofname.empty() || !wmi || !table_int) return false; @@ -484,7 +481,7 @@ bool GalWeight::SaveSpaceTimeWeights(const wxString& ofname, GalElement* gal = this->gal; if (!gal) return false; - vector id_vec; + std::vector id_vec; int c_id = table_int->FindColId(this->id_field); if (c_id < 0) return false; @@ -509,7 +506,7 @@ bool GalWeight::SaveSpaceTimeWeights(const wxString& ofname, } } - ofstream out; + std::ofstream out; out.open(GET_ENCODED_FILENAME(ofname)); if (!(out.is_open() && out.good())) return false; @@ -521,14 +518,14 @@ bool GalWeight::SaveSpaceTimeWeights(const wxString& ofname, wxString id_var_name("STID"); out << "0 " << n << " " << layer_name; - out << " " << id_var_name << endl; + out << " " << id_var_name << std::endl; for (size_t i=0; i= 0;) { STID_KEY k(id_vec[gal[j][cp]], time_ids[i]); @@ -536,7 +533,7 @@ bool GalWeight::SaveSpaceTimeWeights(const wxString& ofname, out << n_id; if (cp > 0) out << " "; } - out << endl; + out << std::endl; } } @@ -551,7 +548,6 @@ bool Gda::SaveGal(const GalElement* g, const wxString& id_var_name, const std::vector& id_vec) { - using namespace std; if (g == NULL || ofname.empty() || id_var_name.empty() || id_vec.size() == 0) return false; @@ -560,9 +556,9 @@ bool Gda::SaveGal(const GalElement* g, wxString final_fon(wx_fn.GetFullPath()); #ifdef __WIN32__ - ofstream out(final_fon.wc_str()); + std::ofstream out(final_fon.wc_str()); #else - ofstream out; + std::ofstream out; out.open(GET_ENCODED_FILENAME(final_fon)); #endif if (!(out.is_open() && out.good())) return false; @@ -576,17 +572,17 @@ bool Gda::SaveGal(const GalElement* g, size_t num_obs = (int) id_vec.size(); out << "0 " << num_obs << " " << layer_name; - out << " " << id_var_name << endl; + out << " " << id_var_name << std::endl; for (size_t i=0; i= 0;) { out << id_vec[g[i][cp]]; if (cp > 0) out << " "; } - out << endl; + out << std::endl; } return true; } @@ -597,7 +593,6 @@ bool Gda::SaveGal(const GalElement* g, const wxString& id_var_name, const std::vector& id_vec) { - using namespace std; if (g == NULL || ofname.empty() || id_var_name.empty() || id_vec.size() == 0) return false; @@ -606,9 +601,9 @@ bool Gda::SaveGal(const GalElement* g, wxString final_fon(wx_fn.GetFullPath()); #ifdef __WIN32__ - ofstream out(final_fon.wc_str()); + std::ofstream out(final_fon.wc_str()); #else - ofstream out; + std::ofstream out; out.open(GET_ENCODED_FILENAME(final_fon)); #endif if (!(out.is_open() && out.good())) @@ -623,17 +618,17 @@ bool Gda::SaveGal(const GalElement* g, } size_t num_obs = (int) id_vec.size(); out << "0 " << num_obs << " " << layer_name; - out << " " << id_var_name << endl; + out << " " << id_var_name << std::endl; for (size_t i=0; i= 0;) { out << id_vec[g[i][cp]]; if (cp > 0) out << " "; } - out << endl; + out << std::endl; } return true; } @@ -645,7 +640,6 @@ bool Gda::SaveSpaceTimeGal(const GalElement* g, const wxString& id_var_name, const std::vector& id_vec) { - using namespace std; if (g == NULL || ofname.empty() || id_var_name.empty() || id_vec.size() == 0) return false; @@ -653,9 +647,9 @@ bool Gda::SaveSpaceTimeGal(const GalElement* g, wx_fn.SetExt("gal"); wxString final_fon(wx_fn.GetFullPath()); #ifdef __WIN32__ - ofstream out(final_fon.wc_str()); + std::ofstream out(final_fon.wc_str()); #else - ofstream out; + std::ofstream out; out.open(GET_ENCODED_FILENAME(final_fon)); #endif if (!(out.is_open() && out.good())) return false; @@ -672,18 +666,18 @@ bool Gda::SaveSpaceTimeGal(const GalElement* g, } out << "0 " << n << " " << layer_name; - out << " " << id_var_name << endl; + out << " " << id_var_name << std::endl; for (size_t i=0; i= 0;) { out << id_vec[g[i][cp]] << "_t" << time_ids[i]; if (cp > 0) out << " "; } - out << endl; + out << std::endl; } } return true; @@ -696,17 +690,16 @@ void Gda::MakeHigherOrdContiguity(size_t distance, size_t obs, GalElement* W, bool cummulative) { - using namespace std; if (obs < 1 || distance <=1) return; - vector > X(obs); + std::vector > X(obs); for (size_t i=0; i > n_at_d(distance+1); + std::vector > n_at_d(distance+1); n_at_d[0].insert(i); for (size_t j=0, sz=W[i].Size(); j::const_iterator it=n_at_d[d-1].begin(); + for (std::set::const_iterator it=n_at_d[d-1].begin(); it!=n_at_d[d-1].end(); ++it) { for (size_t j=0, sz=W[*it].Size(); j::const_iterator it=n_at_d[d].begin(); + for (std::set::const_iterator it=n_at_d[d].begin(); it!=n_at_d[d].end(); ++it) { X[i][cnt++] = *it; } } - sort(X[i].begin(), X[i].end(), greater()); + sort(X[i].begin(), X[i].end(), std::greater()); } for (size_t i=0; i nnbrs_array; + std::vector nnbrs_array; std::map e_dict; for (int i=0; i& newids, std::vector& stack_ids, const wxString& ofname) { - using namespace std; if (!project || ofname.empty()) return false; WeightsManInterface* wmi = project->GetWManInt(); @@ -169,9 +168,9 @@ bool GwtWeight::SaveDIDWeights(Project* project, int num_obs, std::vector id_vec; + std::vector id_vec; int c_id = table_int->FindColId(this->id_field); if (c_id < 0) return false; @@ -243,9 +240,9 @@ bool GwtWeight::SaveSpaceTimeWeights(const wxString& ofname, WeightsManInterface } #ifdef __WIN32__ - ofstream out(ofname.wc_str()); + std::ofstream out(ofname.wc_str()); #else - ofstream out; + std::ofstream out; out.open(GET_ENCODED_FILENAME(ofname)); #endif @@ -259,7 +256,7 @@ bool GwtWeight::SaveSpaceTimeWeights(const wxString& ofname, WeightsManInterface wxString id_var_name("STID"); out << "0 " << n << " " << layer_name; - out << " " << id_var_name << endl; + out << " " << id_var_name << std::endl; for (size_t i=0; i& id_vec) { - using namespace std; if (g == NULL || _layer_name.IsEmpty() || ofname.IsEmpty() || id_vec.size() == 0) return false; @@ -296,9 +292,9 @@ bool Gda::SaveGwt(const GwtElement* g, wxString final_ofn(wx_fn.GetFullPath()); #ifdef __WIN32__ - ofstream out(final_ofn.wc_str()); + std::ofstream out(final_ofn.wc_str()); #else - ofstream out; + std::ofstream out; out.open(GET_ENCODED_FILENAME(final_ofn)); #endif @@ -313,14 +309,14 @@ bool Gda::SaveGwt(const GwtElement* g, size_t num_obs = (int) id_vec.size(); out << "0 " << num_obs << " " << layer_name; - out << " " << id_var_name << endl; + out << " " << id_var_name << std::endl; for (int i=0; i& id_vec) { - using namespace std; if (g == NULL || _layer_name.IsEmpty() || ofname.IsEmpty() || id_vec.size() == 0) return false; @@ -341,9 +336,9 @@ bool Gda::SaveGwt(const GwtElement* g, wxString final_ofn(wx_fn.GetFullPath()); #ifdef __WIN32__ - ofstream out(final_ofn.wc_str()); + std::ofstream out(final_ofn.wc_str()); #else - ofstream out; + std::ofstream out; out.open(GET_ENCODED_FILENAME(final_ofn)); #endif @@ -358,14 +353,14 @@ bool Gda::SaveGwt(const GwtElement* g, size_t num_obs = (int) id_vec.size(); out << "0 " << num_obs << " " << layer_name; - out << " " << id_var_name << endl; + out << " " << id_var_name << std::endl; for (int i=0; i #include "Lowess.h" -using namespace std; - #define imin2(a,b) std::min(a,b) #define imax2(a,b) std::max(a,b) #define fmax2(a,b) std::max(a,b) diff --git a/ShapeOperations/OGRDataAdapter.cpp b/ShapeOperations/OGRDataAdapter.cpp index f8855bf37..c232796fb 100644 --- a/ShapeOperations/OGRDataAdapter.cpp +++ b/ShapeOperations/OGRDataAdapter.cpp @@ -44,7 +44,7 @@ OGRDataAdapter::OGRDataAdapter() void OGRDataAdapter::Close() { // clean ogr_ds_pool - map::iterator it; + std::map::iterator it; for(it=ogr_ds_pool.begin(); it!=ogr_ds_pool.end(); it++) { OGRDatasourceProxy* ds = it->second; if (ds) { @@ -107,7 +107,7 @@ void OGRDataAdapter::CleanHistory() gda_cache->CleanHistory(); } -GdaConst::DataSourceType OGRDataAdapter::GetLayerNames(const wxString& ds_name, GdaConst::DataSourceType& ds_type, vector& layer_names) +GdaConst::DataSourceType OGRDataAdapter::GetLayerNames(const wxString& ds_name, GdaConst::DataSourceType& ds_type, std::vector& layer_names) { OGRDatasourceProxy* ds_proxy = GetDatasourceProxy(ds_name, ds_type); ds_type = ds_proxy->ds_type; @@ -167,10 +167,10 @@ void OGRDataAdapter::CancelExport(OGRLayerProxy* layer) } OGRwkbGeometryType -OGRDataAdapter::MakeOGRGeometries(vector& geometries, +OGRDataAdapter::MakeOGRGeometries(std::vector& geometries, Shapefile::ShapeType shape_type, - vector& ogr_geometries, - vector& selected_rows) + std::vector& ogr_geometries, + std::vector& selected_rows) { OGRwkbGeometryType eGType = wkbNone; int n = selected_rows.size(); @@ -257,7 +257,7 @@ OGRDataAdapter::MakeOGRGeometries(vector& geometries, for ( int num_part = 0; num_part < numParts; num_part++ ) { OGRPolygon* polygon = (OGRPolygon*)OGRGeometryFactory::createGeometry(wkbPolygon); OGRLinearRing* ring = (OGRLinearRing*)OGRGeometryFactory::createGeometry(wkbLinearRing); - vector startIndexes = poly->pc->parts; + std::vector startIndexes = poly->pc->parts; startIndexes.push_back(numPoints); for ( size_t j = startIndexes[num_part]; j < startIndexes[num_part+1]; j++ ) @@ -284,9 +284,9 @@ OGRDataAdapter::ExportDataSource(const wxString& o_ds_format, const wxString& o_ds_name, const wxString& o_layer_name, OGRwkbGeometryType geom_type, - vector ogr_geometries, + std::vector ogr_geometries, TableInterface* table, - vector& selected_rows, + std::vector& selected_rows, OGRSpatialReference* spatial_ref, bool is_update, wxString cpg_encode) @@ -296,13 +296,13 @@ OGRDataAdapter::ExportDataSource(const wxString& o_ds_format, // field identifier: a pair value to indicate how to // retreive real field name and cell value for time-enabled table - typedef pair field_idn; - vector field_idn_s; - vector field_name_s; + typedef std::pair field_idn; + std::vector field_idn_s; + std::vector field_name_s; // check field names first if ( table != NULL ) { // get all field names for FieldNameCorrectionDlg - vector all_fnames; + std::vector all_fnames; int time_steps = table->GetTimeSteps(); for ( int id=0; id < table->GetNumberCols(); id++ ) { if (table->IsColTimeVariant(id)) { @@ -315,7 +315,7 @@ OGRDataAdapter::ExportDataSource(const wxString& o_ds_format, GdaException::FIELD_NAME_EMPTY); } all_fnames.push_back(fname); - field_idn_s.push_back(make_pair(id, t)); + field_idn_s.push_back(std::make_pair(id, t)); field_name_s.push_back(fname); } } else { @@ -327,7 +327,7 @@ OGRDataAdapter::ExportDataSource(const wxString& o_ds_format, GdaException::FIELD_NAME_EMPTY); } all_fnames.push_back(fname); - field_idn_s.push_back(make_pair(id, 0)); + field_idn_s.push_back(std::make_pair(id, 0)); field_name_s.push_back(fname); } } @@ -339,7 +339,7 @@ OGRDataAdapter::ExportDataSource(const wxString& o_ds_format, // cancel at Field Name Correction return NULL; } - vector new_field_name_s = fname_correct_dlg.GetNewFieldNames(); + std::vector new_field_name_s = fname_correct_dlg.GetNewFieldNames(); for (size_t i=0; i ogr_ds_pool; + std::map ogr_ds_pool; OGRDatasourceProxy* export_ds; @@ -85,7 +84,7 @@ class OGRDataAdapter { // Note: this should be moved to OGRlayerProxy int export_progress; bool stop_exporting; - ostringstream error_message; + std::ostringstream error_message; public: static OGRDataAdapter& GetInstance() { @@ -117,7 +116,7 @@ class OGRDataAdapter { * functions for cache.sqlite used by GeoDa * */ - vector GetHistory(const wxString& param_key); + std::vector GetHistory(const wxString& param_key); void AddHistory(const wxString& param_key, const wxString& param_val); void AddEntry(const wxString& param_key, const wxString& param_val); void CleanHistory(); @@ -128,7 +127,7 @@ class OGRDataAdapter { * @param ds_name OGR data source name * @param layer_names a reference to a string vector that stores layer names */ - GdaConst::DataSourceType GetLayerNames(const wxString& ds_name, GdaConst::DataSourceType& ds_type, vector& layer_names); + GdaConst::DataSourceType GetLayerNames(const wxString& ds_name, GdaConst::DataSourceType& ds_type, std::vector& layer_names); /** @@ -157,9 +156,9 @@ class OGRDataAdapter { const wxString& o_ds_name, const wxString& o_layer_name, OGRwkbGeometryType geom_type, - vector ogr_geometries, + std::vector ogr_geometries, TableInterface* table, - vector& selected_rows, + std::vector& selected_rows, OGRSpatialReference* spatial_ref, bool is_update, wxString cpg_encode = wxEmptyString); @@ -171,9 +170,9 @@ class OGRDataAdapter { /** * Create OGR geometries from internal GdaShapes */ - OGRwkbGeometryType MakeOGRGeometries(vector& geometries, + OGRwkbGeometryType MakeOGRGeometries(std::vector& geometries, Shapefile::ShapeType shape_type, - vector& ogr_geometries, - vector& selected_rows); + std::vector& ogr_geometries, + std::vector& selected_rows); }; #endif diff --git a/ShapeOperations/OGRDatasourceProxy.cpp b/ShapeOperations/OGRDatasourceProxy.cpp index 9e292c305..15ebcd406 100644 --- a/ShapeOperations/OGRDatasourceProxy.cpp +++ b/ShapeOperations/OGRDatasourceProxy.cpp @@ -33,9 +33,6 @@ #include "../GenUtils.h" #include "../GeneralWxUtils.h" -using namespace std; - - OGRDatasourceProxy::OGRDatasourceProxy(GDALDataset* _ds, wxString _ds_name) : ds(_ds), ds_name(_ds_name) { @@ -117,7 +114,7 @@ OGRDatasourceProxy::OGRDatasourceProxy(wxString format, wxString dest_datasource : ds_name(dest_datasource) { // create a OGRDatasourceProxy with a geometry layer - ostringstream error_message; + std::ostringstream error_message; const char* pszFormat = format.c_str(); const char* pszDestDataSource = GET_ENCODED_FILENAME(ds_name); @@ -159,7 +156,7 @@ OGRDatasourceProxy::OGRDatasourceProxy(wxString format, wxString dest_datasource OGRDatasourceProxy::~OGRDatasourceProxy() { // clean map of layer_pool - map::iterator it; + std::map::iterator it; for (it=layer_pool.begin(); it!=layer_pool.end(); it++) { if (it->second) delete it->second; @@ -176,7 +173,7 @@ OGRDatasourceProxy::GetGdaDataSourceType(GDALDriver *poDriver) if (poDriver == NULL) return GdaConst::ds_unknown; const char* drv_name = GDALGetDriverShortName(poDriver); - string ogr_ds_type(drv_name); + std::string ogr_ds_type(drv_name); if (ogr_ds_type.find("Carto") != std::string::npos) { return GdaConst::datasrc_str_to_type["Carto"]; @@ -189,7 +186,7 @@ OGRDatasourceProxy::GetGdaDataSourceType(GDALDriver *poDriver) } } -vector OGRDatasourceProxy::GetLayerNames() +std::vector OGRDatasourceProxy::GetLayerNames() { // GetLayerNames can happen before actually read data from layer // , so this provide us a chance to store all OGRLayer instance @@ -266,7 +263,7 @@ bool OGRDatasourceProxy::DeleteLayer(wxString layer_name) wxString tmp_layer_name(layer->GetName()); if ( tmp_layer_name.compare(layer_name) == 0) { if ( ds->DeleteLayer(i) == OGRERR_NONE ) { - map::iterator it = + std::map::iterator it = layer_pool.find(layer_name); if ( it != layer_pool.end()) { layer_pool.erase(it); @@ -347,9 +344,9 @@ void OGRDatasourceProxy::CreateDataSource(wxString format, OGRLayerProxy* OGRDatasourceProxy::CreateLayer(wxString layer_name, OGRwkbGeometryType eGType, - vector& geometries, + std::vector& geometries, TableInterface* table, - vector& selected_rows, + std::vector& selected_rows, OGRSpatialReference* spatial_ref, wxString cpg_encode) { @@ -396,7 +393,7 @@ OGRDatasourceProxy::CreateLayer(wxString layer_name, throw GdaException(error_message.mb_str()); } OGRFeatureDefn* poFeatDef = poDstLayer->GetLayerDefn(); - map >::iterator field_it; + std::map >::iterator field_it; // create fields using TableInterface:table if ( table != NULL ) { std::vector col_id_map; // using orders in wxGrid diff --git a/ShapeOperations/OGRDatasourceProxy.h b/ShapeOperations/OGRDatasourceProxy.h index 62616fadd..f645f3236 100644 --- a/ShapeOperations/OGRDatasourceProxy.h +++ b/ShapeOperations/OGRDatasourceProxy.h @@ -30,8 +30,6 @@ #include "../GdaShape.h" #include "../DataViewer/TableInterface.h" -using namespace std; - /** * A proxy class for OGR data source. It will parallel run threaded * OGRLayerProxy instances to fetch data from different data resources @@ -69,9 +67,9 @@ class OGRDatasourceProxy { size_t layer_count; //!< number of layer in this data source - map layer_pool; //!< dict for all opened layers + std::map layer_pool; //!< dict for all opened layers - vector layer_names; + std::vector layer_names; /** * This function clean the memory (geometies and table) of contained layers @@ -95,7 +93,7 @@ class OGRDatasourceProxy { * Return the number of layers, in case there is no layer in datasource. * (e.g. an empty spatialite file db). */ - vector GetLayerNames(); + std::vector GetLayerNames(); /** * Return layer proxy according to the layer_name @@ -113,9 +111,9 @@ class OGRDatasourceProxy { OGRLayerProxy* CreateLayer(wxString layer_name, OGRwkbGeometryType eGType, - vector& geometries, + std::vector& geometries, TableInterface* table, - vector& selected_rows, + std::vector& selected_rows, OGRSpatialReference* spatial_ref, wxString cpg_encode = wxEmptyString); diff --git a/ShapeOperations/OGRLayerProxy.cpp b/ShapeOperations/OGRLayerProxy.cpp index f3ef06322..f85297350 100644 --- a/ShapeOperations/OGRLayerProxy.cpp +++ b/ShapeOperations/OGRLayerProxy.cpp @@ -36,7 +36,6 @@ #include "OGRLayerProxy.h" #include "OGRFieldProxy.h" -using namespace std; using namespace boost; namespace bt = boost::posix_time; @@ -168,18 +167,18 @@ bool OGRLayerProxy::ReadFieldInfo() return true; } -vector OGRLayerProxy::GetFieldTypes() +std::vector OGRLayerProxy::GetFieldTypes() { - vector field_types; + std::vector field_types; for( int i=0; i< n_cols; i++) { field_types.push_back(fields[i]->GetType()); } return field_types; } -vector OGRLayerProxy::GetFieldNames() +std::vector OGRLayerProxy::GetFieldNames() { - vector field_names; + std::vector field_names; for( int i=0; i< n_cols; i++) { wxString var = fields[i]->GetName(); field_names.push_back(var); @@ -360,7 +359,7 @@ bool OGRLayerProxy::IsFieldExisted(const wxString& field_name) { // check if field existed by given field name bool case_sensitive = IsFieldCaseSensitive(ds_type); - vector::iterator it; + std::vector::iterator it; for (it = fields.begin(); it!=fields.end(); it++){ wxString name = (*it)->GetName(); if (field_name.IsSameAs(name)){ @@ -465,7 +464,7 @@ bool OGRLayerProxy::UpdateOGRFeature(OGRFeature* feature) return false; } -bool OGRLayerProxy::AppendOGRFeature(vector& content) +bool OGRLayerProxy::AppendOGRFeature(std::vector& content) { OGRFeature *feature = OGRFeature::CreateFeature(layer->GetLayerDefn()); feature->SetFrom( data[0]); @@ -485,7 +484,7 @@ bool OGRLayerProxy::CallCartoDBAPI(wxString url) return true; } -bool OGRLayerProxy::UpdateColumn(int col_idx, vector &vals) +bool OGRLayerProxy::UpdateColumn(int col_idx, std::vector &vals) { for (int rid=0; rid < n_rows; rid++) { SetValueAt(rid, col_idx, vals[rid]); @@ -493,7 +492,7 @@ bool OGRLayerProxy::UpdateColumn(int col_idx, vector &vals) return true; } -bool OGRLayerProxy::UpdateColumn(int col_idx, vector &vals) +bool OGRLayerProxy::UpdateColumn(int col_idx, std::vector &vals) { for (int rid=0; rid < n_rows; rid++) { SetValueAt(rid, col_idx, (GIntBig)vals[rid]); @@ -501,7 +500,7 @@ bool OGRLayerProxy::UpdateColumn(int col_idx, vector &vals) return true; } -bool OGRLayerProxy::UpdateColumn(int col_idx, vector &vals) +bool OGRLayerProxy::UpdateColumn(int col_idx, std::vector &vals) { for (int rid=0; rid < n_rows; rid++) { SetValueAt(rid, col_idx, vals[rid].mb_str()); @@ -509,9 +508,9 @@ bool OGRLayerProxy::UpdateColumn(int col_idx, vector &vals) return true; } -vector OGRLayerProxy::GetIntegerFieldNames() +std::vector OGRLayerProxy::GetIntegerFieldNames() { - vector names; + std::vector names; for (int i=0; iGetType()) { names.push_back(GetFieldName(i)); @@ -520,9 +519,9 @@ vector OGRLayerProxy::GetIntegerFieldNames() return names; } -vector OGRLayerProxy::GetNumericFieldNames() +std::vector OGRLayerProxy::GetNumericFieldNames() { - vector names; + std::vector names; for (int i=0; iGetType() || GdaConst::double_type == fields[i]->GetType()) { @@ -532,9 +531,9 @@ vector OGRLayerProxy::GetNumericFieldNames() return names; } -vector OGRLayerProxy::GetIntegerAndStringFieldNames() +std::vector OGRLayerProxy::GetIntegerAndStringFieldNames() { - vector names; + std::vector names; for (int i=0; iGetType() || GdaConst::string_type == fields[i]->GetType()) { @@ -544,7 +543,7 @@ vector OGRLayerProxy::GetIntegerAndStringFieldNames() return names; } -Shapefile::ShapeType OGRLayerProxy::GetOGRGeometries(vector& geoms, +Shapefile::ShapeType OGRLayerProxy::GetOGRGeometries(std::vector& geoms, OGRSpatialReference* dest_sr) { OGRCoordinateTransformation *poCT = NULL; @@ -584,7 +583,7 @@ Shapefile::ShapeType OGRLayerProxy::GetOGRGeometries(vector& geoms return shape_type; } -Shapefile::ShapeType OGRLayerProxy::GetGdaGeometries(vector& geoms, +Shapefile::ShapeType OGRLayerProxy::GetGdaGeometries(std::vector& geoms, OGRSpatialReference* dest_sr) { bool is_geoms_init = !geoms.empty(); @@ -757,9 +756,9 @@ Shapefile::ShapeType OGRLayerProxy::GetGdaGeometries(vector& geoms, } void -OGRLayerProxy::AddFeatures(vector& geometries, +OGRLayerProxy::AddFeatures(std::vector& geometries, TableInterface* table, - vector& selected_rows) + std::vector& selected_rows) { export_progress = 0; stop_exporting = false; @@ -796,9 +795,9 @@ OGRLayerProxy::AddFeatures(vector& geometries, export_progress = -1; return; } - vector undefs; + std::vector undefs; if ( ftype == GdaConst::long64_type) { - vector col_data; + std::vector col_data; table->GetDirectColData(col_pos, col_data); table->GetDirectColUndefined(col_pos, undefs); @@ -814,7 +813,7 @@ OGRLayerProxy::AddFeatures(vector& geometries, } } else if (ftype == GdaConst::double_type) { - vector col_data; + std::vector col_data; table->GetDirectColData(col_pos, col_data); table->GetDirectColUndefined(col_pos, undefs); @@ -832,7 +831,7 @@ OGRLayerProxy::AddFeatures(vector& geometries, ftype == GdaConst::time_type || ftype == GdaConst::datetime_type ) { - vector col_data; + std::vector col_data; table->GetDirectColData(col_pos, col_data); table->GetDirectColUndefined(col_pos, undefs); @@ -862,7 +861,7 @@ OGRLayerProxy::AddFeatures(vector& geometries, } else { // others are treated as string_type // XXX encodings - vector col_data; + std::vector col_data; table->GetDirectColData(col_pos, col_data); table->GetDirectColUndefined(col_pos, undefs); @@ -1084,7 +1083,7 @@ bool OGRLayerProxy::AddGeometries(Shapefile::Main& p_main) if (n_geom < n_rows) return false; - vector geometries; + std::vector geometries; Shapefile::ShapeType shape_type = Shapefile::NULL_SHAPE; int num_geometries = p_main.records.size(); if ( p_main.header.shape_type == Shapefile::POINT_TYP) { @@ -1150,7 +1149,7 @@ bool OGRLayerProxy::AddGeometries(Shapefile::Main& p_main) for ( int num_part = 0; num_part < numParts; num_part++ ) { OGRPolygon polygon; OGRLinearRing ring; - vector startIndexes = poly->pc->parts; + std::vector startIndexes = poly->pc->parts; startIndexes.push_back(numPoints); for ( int j = startIndexes[num_part]; j < startIndexes[num_part+1]; j++ ) { @@ -1209,7 +1208,7 @@ bool OGRLayerProxy::GetExtent(double& minx, double& miny, return true; } -void OGRLayerProxy::GetCentroids(vector& centroids) +void OGRLayerProxy::GetCentroids(std::vector& centroids) { if (centroids.size() == 0 && n_rows > 0) { // if centroids is empty @@ -1237,7 +1236,7 @@ OGRGeometry* OGRLayerProxy::GetGeometry(int idx) return geometry; } -GdaPolygon* OGRLayerProxy::DissolvePolygons(vector& geoms) +GdaPolygon* OGRLayerProxy::DissolvePolygons(std::vector& geoms) { OGRMultiPolygon geocol; for (size_t i=0; i < geoms.size(); i++ ) { @@ -1602,7 +1601,7 @@ bool OGRLayerProxy::ReadGeometries(Shapefile::Main& p_main) p_main.records[feature_counter++].contents_p = pc; } else { - string open_err_msg = "GeoDa does not support datasource with line data at this time. Please choose a datasource with either point or polygon data."; + std::string open_err_msg = "GeoDa does not support datasource with line data at this time. Please choose a datasource with either point or polygon data."; throw GdaException(open_err_msg.c_str()); } } diff --git a/ShapeOperations/OGRLayerProxy.h b/ShapeOperations/OGRLayerProxy.h index e8dbb866d..7e888f549 100644 --- a/ShapeOperations/OGRLayerProxy.h +++ b/ShapeOperations/OGRLayerProxy.h @@ -33,9 +33,6 @@ #include "OGRFieldProxy.h" #include "OGRLayerProxy.h" - -using namespace std; - /** * A threaded proxy class for OGR layer. It will read all meta information, such * as field properties, and data from OGR data soruce. @@ -74,12 +71,12 @@ class OGRLayerProxy { OGRLayer* layer; //!< Fields and the meta data are stored in OGRFieldProxy. - vector fields; + std::vector fields; //!< OGR will read data sources and store the he content in many OGRFeature //!< objects. The OGRLayerProxy will maintain these objects until the proxy //!< is dismissed. - vector data; + std::vector data; //!< OGR layer GeomType OGRwkbGeometryType eGType; @@ -119,9 +116,9 @@ class OGRLayerProxy { * Add new features to an empty OGRLayer * This function should be only used when create a new OGRLayer */ - void AddFeatures(vector& geometries, + void AddFeatures(std::vector& geometries, TableInterface* table, - vector& selected_rows); + std::vector& selected_rows); /** * Read geometries and save to Shapefile::Main data structure. @@ -130,20 +127,20 @@ class OGRLayerProxy { bool AddGeometries(Shapefile::Main& p_main); - void GetCentroids(vector& centroids); + void GetCentroids(std::vector& centroids); static GdaPolygon* OGRGeomToGdaShape(OGRGeometry* geom); - static GdaPolygon* DissolvePolygons(vector& geoms); + static GdaPolygon* DissolvePolygons(std::vector& geoms); GdaPolygon* GetMapBoundary(); std::vector DissolveMap(const std::map >& cids); - Shapefile::ShapeType GetGdaGeometries(vector& geoms, + Shapefile::ShapeType GetGdaGeometries(std::vector& geoms, OGRSpatialReference* input_sr=NULL); - Shapefile::ShapeType GetOGRGeometries(vector& geoms, + Shapefile::ShapeType GetOGRGeometries(std::vector& geoms, OGRSpatialReference* input_sr=NULL); /** @@ -200,9 +197,9 @@ class OGRLayerProxy { void SetFieldDecimals(int pos, int new_dec); bool UpdateColumn(); - bool UpdateColumn(int col_idx, vector &vals); - bool UpdateColumn(int col_idx, vector &vals); - bool UpdateColumn(int col_idx, vector &vals); + bool UpdateColumn(int col_idx, std::vector &vals); + bool UpdateColumn(int col_idx, std::vector &vals); + bool UpdateColumn(int col_idx, std::vector &vals); bool IsTableOnly(); @@ -210,23 +207,23 @@ class OGRLayerProxy { bool UpdateOGRFeature(OGRFeature* feature); - bool AppendOGRFeature(vector& content); + bool AppendOGRFeature(std::vector& content); bool InsertOGRFeature(); - vector GetFieldTypes(); + std::vector GetFieldTypes(); - vector GetFieldNames(); + std::vector GetFieldNames(); OGRFeature* GetFeatureAt(int rid); OGRGeometry* GetGeometry(int idx); - vector GetIntegerFieldNames(); + std::vector GetIntegerFieldNames(); - vector GetNumericFieldNames(); + std::vector GetNumericFieldNames(); - vector GetIntegerAndStringFieldNames(); + std::vector GetIntegerAndStringFieldNames(); bool IsUndefined(int rid, int cid); diff --git a/ShapeOperations/PolysToContigWeights.cpp b/ShapeOperations/PolysToContigWeights.cpp index 41cd053dc..506040b80 100644 --- a/ShapeOperations/PolysToContigWeights.cpp +++ b/ShapeOperations/PolysToContigWeights.cpp @@ -37,9 +37,6 @@ #include "../GenUtils.h" #include "PolysToContigWeights.h" -using namespace std; - - /* BasePartition */ @@ -114,7 +111,7 @@ PartitionP::~PartitionP() void PartitionP::include(const int incl) { int where = cellIndex [ incl ]; // if (where < 0 || where >= cells || incl < 0 || incl >= elements) - // cout << "including " << incl << " at " << where << endl; + // std::cout << "including " << incl << " at " << where << std::endl; int old= cell [ where ]; cell [ where ] = incl; if (old != GdaConst::EMPTY) @@ -452,7 +449,7 @@ GalElement* PolysToContigWeights(Shapefile::Main& main, bool is_queen, if (!gl) return NULL; GeoDaSet Neighbors(gRecords), Related(gRecords); - // cout << "total steps= " << gMinX.Cells() << endl; + // cout << "total steps= " << gMinX.Cells() << std::endl; for (int step= 0; step < gMinX.Cells(); ++step) { // include all elements from xmin[step] @@ -489,7 +486,7 @@ GalElement* PolysToContigWeights(Shapefile::Main& main, bool is_queen, if (ply->intersect(nbr_ply)) { PolygonPartition nbrPoly(nbr_ply); - //shp.seekg(gOffset[nbr]+12, ios::beg); + //shp.seekg(gOffset[nbr]+12, std::ios::beg); //nbrPoly.ReadShape(shp); //if (curr == 0 && nbr == 0) { @@ -518,7 +515,7 @@ GalElement* PolysToContigWeights(Shapefile::Main& main, bool is_queen, if (gOffset) delete [] gOffset; gOffset = 0; //MakeFull(gl, gRecords); - vector > G(gRecords); + std::vector > G(gRecords); for (size_t i=0; i::iterator it=G[i].begin(); it!=G[i].end(); ++it) { + for (std::set::iterator it=G[i].begin(); it!=G[i].end(); ++it) { gl[i].SetNbr(cnt++, *it); } gl[i].SortNbrs(); @@ -566,7 +563,7 @@ GalElement* PolysToContigWeights(OGRLayer* layer, bool is_queen, gMaxX.alloc(gRecords, gx, shp_x_len); OGRFeature* feature = NULL; - vector features; + std::vector features; layer->ResetReading(); while ((feature = layer->GetNextFeature()) != NULL) { features.push_back(feature); @@ -613,7 +610,7 @@ GalElement* PolysToContigWeights(OGRLayer* layer, bool is_queen, int curr; GeoDaSet Neighbors(gRecords), Related(gRecords); - // cout << "total steps= " << gMinX.Cells() << endl; + // cout << "total steps= " << gMinX.Cells() << std::endl; for (int step= 0; step < gMinX.Cells(); ++step) { // include all elements from xmin[step] for (curr= gMinX.first(step); curr != GdaConst::EMPTY; @@ -678,7 +675,7 @@ GalElement* PolysToContigWeights(OGRLayer* layer, bool is_queen, if (gY) delete gY; gY = 0; //MakeFull(gl, gRecords); - vector > G(gRecords); + std::vector > G(gRecords); for (size_t i=0; i::iterator it=G[i].begin(); it!=G[i].end(); ++it) { + for (std::set::iterator it=G[i].begin(); it!=G[i].end(); ++it) { gl[i].SetNbr(cnt++, *it); } gl[i].SortNbrs(); diff --git a/ShapeOperations/PolysToContigWeights.h b/ShapeOperations/PolysToContigWeights.h index 8448c24a7..b7352ef78 100644 --- a/ShapeOperations/PolysToContigWeights.h +++ b/ShapeOperations/PolysToContigWeights.h @@ -52,7 +52,7 @@ class BasePartition { // if (where < -1 || where > cells || incl < 0 || incl >= elements) // cout << " BasePartition: incl= " << incl << " location= " // << where << " els= " << elements << " cells= " - // << cells << endl; + // << cells << std::endl; if (where < 0) where= 0; else if (where >= cells) where= cells-1; next [ incl ] = cell [ where ]; @@ -81,7 +81,7 @@ class PartitionP : public BasePartition { void initIx(const int incl, const double range) { int cl= (int) floor(range / step); // if (cl < -1 || cl > cells || incl < 0 || incl >= elements) - // cout << "PartitionP: incl= " << incl << " at " << cl << endl; + // cout << "PartitionP: incl= " << incl << " at " << cl << std::endl; if (cl < 0) cl= 0; else if (cl >= cells) cl= cells-1; cellIndex[ incl ] = cl; diff --git a/ShapeOperations/WeightUtils.cpp b/ShapeOperations/WeightUtils.cpp index 9073629b7..0d9c107ae 100644 --- a/ShapeOperations/WeightUtils.cpp +++ b/ShapeOperations/WeightUtils.cpp @@ -38,17 +38,16 @@ wxString WeightUtils::ReadIdField(const wxString& fname) { - using namespace std; wxString ext = GenUtils::GetFileExt(fname).Lower(); if (ext != "gal" && ext != "gwt" && ext != "kwt") { return ""; } #ifdef __WIN32__ - ifstream file(fname.wc_str()); + std::ifstream file(fname.wc_str()); #else - ifstream file; - file.open(GET_ENCODED_FILENAME(fname), ios::in); // a text file + std::ifstream file; + file.open(GET_ENCODED_FILENAME(fname), std::ios::in); // a text file #endif if (!(file.is_open() && file.good())) return ""; @@ -56,17 +55,17 @@ wxString WeightUtils::ReadIdField(const wxString& fname) // First determine if header line is correct // Can be either: int int string string (type n_obs filename field) // or : int (n_obs) - string str; + std::string str; getline(file, str); - stringstream ss (str, stringstream::in | stringstream::out); + std::stringstream ss (str, std::stringstream::in | std::stringstream::out); wxInt64 num1 = 0; wxInt64 num2 = 0; wxInt64 num_obs = 0; - string dbf_name, t_key_field; + std::string dbf_name, t_key_field; - string line; + std::string line; std::getline(ss, line); wxString header(line); @@ -87,7 +86,7 @@ wxString WeightUtils::ReadIdField(const wxString& fname) } else { ss.clear(); - ss.seekg(0, ios::beg); // reset to beginning + ss.seekg(0, std::ios::beg); // reset to beginning ss >> num1 >> num2 >> dbf_name >> t_key_field; } @@ -109,12 +108,11 @@ wxString WeightUtils::ReadIdField(const wxString& fname) GalElement* WeightUtils::ReadGal(const wxString& fname, TableInterface* table_int) { - using namespace std; #ifdef __WIN32__ - ifstream file(fname.wc_str()); + std::ifstream file(fname.wc_str()); #else - ifstream file; - file.open(GET_ENCODED_FILENAME(fname), ios::in); // a text file + std::ifstream file; + file.open(GET_ENCODED_FILENAME(fname), std::ios::in); // a text file #endif if (!(file.is_open() && file.good())) { @@ -127,17 +125,17 @@ GalElement* WeightUtils::ReadGal(const wxString& fname, int line_cnt = 0; bool use_rec_order = false; - string str; + std::string str; getline(file, str); line_cnt++; - stringstream ss (str, stringstream::in | stringstream::out); + std::stringstream ss (str, std::stringstream::in | std::stringstream::out); wxInt64 num1 = 0; wxInt64 num2 = 0; wxInt64 num_obs = 0; - string dbf_name, t_key_field; + std::string dbf_name, t_key_field; - string line; + std::string line; std::getline(ss, line); wxString header(line); @@ -158,7 +156,7 @@ GalElement* WeightUtils::ReadGal(const wxString& fname, } else { ss.clear(); - ss.seekg(0, ios::beg); // reset to beginning + ss.seekg(0, std::ios::beg); // reset to beginning ss >> num1 >> num2 >> dbf_name >> t_key_field; } @@ -190,7 +188,7 @@ GalElement* WeightUtils::ReadGal(const wxString& fname, // either be empty or blank. // note: we use wxString as key (convert int to string) for the case of any // string type numbers (e.g. the FIPS) - map id_map; + std::map id_map; if (use_rec_order) { // we need to traverse through every second line of the file and @@ -209,7 +207,7 @@ GalElement* WeightUtils::ReadGal(const wxString& fname, } if (file.eof()) continue; { - stringstream ss (str, stringstream::in | stringstream::out); + std::stringstream ss (str, std::stringstream::in | std::stringstream::out); ss >> obs >> num_neigh; if (obs < min_val) { min_val = obs; @@ -265,7 +263,7 @@ GalElement* WeightUtils::ReadGal(const wxString& fname, // get mapping from key_field to record ids (which always start // from 0 internally, but are displayed to the user from 1) if (table_int->GetColType(col) == GdaConst::long64_type) { - vector vec; + std::vector vec; table_int->GetColData(col, 0, vec); for (int i=0; iGetColType(col) == GdaConst::string_type) { - vector vec; + std::vector vec; table_int->GetColData(col, 0, vec); for (int i=0; i::iterator it; + std::map::iterator it; while (!file.eof()) { int gal_obs; std::string obs; @@ -308,7 +306,7 @@ GalElement* WeightUtils::ReadGal(const wxString& fname, } if (file.eof()) continue; { - stringstream ss (str, stringstream::in | stringstream::out); + std::stringstream ss (str, std::stringstream::in | std::stringstream::out); ss >> obs >> num_neigh; it = id_map.find(wxString(obs)); if (it == id_map.end()) { @@ -338,9 +336,9 @@ GalElement* WeightUtils::ReadGal(const wxString& fname, } if (file.eof()) continue; { - stringstream ss (str, stringstream::in | stringstream::out); + std::stringstream ss (str, std::stringstream::in | std::stringstream::out); for (int j=0; j> neigh; it = id_map.find(wxString(neigh)); if (it == id_map.end()) { @@ -380,12 +378,11 @@ GalElement* WeightUtils::ReadGal(const wxString& fname, GalElement* WeightUtils::ReadGwtAsGal(const wxString& fname, TableInterface* table_int) { - using namespace std; #ifdef __WIN32__ - ifstream file(fname.wc_str()); + std::ifstream file(fname.wc_str()); #else - ifstream file; - file.open(GET_ENCODED_FILENAME(fname), ios::in); // a text file + std::ifstream file; + file.open(GET_ENCODED_FILENAME(fname), std::ios::in); // a text file #endif if (!(file.is_open() && file.good())) { @@ -397,17 +394,17 @@ GalElement* WeightUtils::ReadGwtAsGal(const wxString& fname, // or : int (n_obs) bool use_rec_order = false; - string str; + std::string str; getline(file, str); - cout << str << endl; - stringstream ss(str, stringstream::in | stringstream::out); + std::cout << str << std::endl; + std::stringstream ss(str, std::stringstream::in | std::stringstream::out); wxInt64 num1 = 0; wxInt64 num2 = 0; wxInt64 num_obs = 0; - string dbf_name, t_key_field; + std::string dbf_name, t_key_field; - string line; + std::string line; std::getline(ss, line); wxString header(line); @@ -428,7 +425,7 @@ GalElement* WeightUtils::ReadGwtAsGal(const wxString& fname, } else { ss.clear(); - ss.seekg(0, ios::beg); // reset to beginning + ss.seekg(0, std::ios::beg); // reset to beginning ss >> num1 >> num2 >> dbf_name >> t_key_field; } @@ -452,9 +449,9 @@ GalElement* WeightUtils::ReadGwtAsGal(const wxString& fname, } file.clear(); - file.seekg(0, ios::beg); // reset to beginning + file.seekg(0, std::ios::beg); // reset to beginning getline(file, str); // skip header line - map id_map; + std::map id_map; if (use_rec_order) { // we need to traverse through every line of the file and // record the max and min values. So long as the max and min @@ -466,7 +463,7 @@ GalElement* WeightUtils::ReadGwtAsGal(const wxString& fname, wxInt64 obs1=0, obs2=0; getline(file, str); if (!str.empty()) { - stringstream ss (str, stringstream::in | stringstream::out); + std::stringstream ss (str, std::stringstream::in | std::stringstream::out); ss >> obs1 >> obs2; if (obs1 < min_val) { min_val = obs1; @@ -514,7 +511,7 @@ GalElement* WeightUtils::ReadGwtAsGal(const wxString& fname, // get mapping from key_field to record ids (which always start // from 0 internally, but are displayed to the user from 1) if (table_int->GetColType(col) == GdaConst::long64_type) { - vector vec; + std::vector vec; table_int->GetColData(col, 0, vec); for (int i=0; iGetColType(col) == GdaConst::string_type) { - vector vec; + std::vector vec; table_int->GetColData(col, 0, vec); for (int i=0; i >::iterator it; - map > nbr_histogram; + std::map >::iterator it; + std::map > nbr_histogram; while (!file.eof()) { - string obs1, obs2; + std::string obs1, obs2; getline(file, str); if (!str.empty()) { - stringstream ss (str, stringstream::in | stringstream::out); + std::stringstream ss (str, std::stringstream::in | std::stringstream::out); ss >> obs1 >> obs2; it = nbr_histogram.find(wxString(obs1)); if (it == nbr_histogram.end()) { - set s; + std::set s; nbr_histogram[obs1] = s; } if (obs2 != obs1) @@ -561,27 +558,27 @@ GalElement* WeightUtils::ReadGwtAsGal(const wxString& fname, } } - vector gal_cnt(num_obs, 0); + std::vector gal_cnt(num_obs, 0); GalElement* gal = new GalElement[num_obs]; file.clear(); - file.seekg(0, ios::beg); // reset to beginning + file.seekg(0, std::ios::beg); // reset to beginning getline(file, str); // skip header line - map::iterator it1; - map::iterator it2; + std::map::iterator it1; + std::map::iterator it2; int line_num=1; while (!file.eof()) { int gwt_obs1, gwt_obs2; //wxInt64 obs1, obs2; - string obs1, obs2; + std::string obs1, obs2; double wVal; getline(file, str); if (!str.empty()) { - stringstream ss(str, stringstream::in | stringstream::out); + std::stringstream ss(str, std::stringstream::in | std::stringstream::out); ss >> obs1 >> obs2 >> wVal; it1 = id_map.find(obs1); it2 = id_map.find(obs2); if (it1 == id_map.end() || it2 == id_map.end()) { - string obs; + std::string obs; if (it1 == id_map.end()) obs = obs1; if (it2 == id_map.end()) @@ -626,12 +623,11 @@ GalElement* WeightUtils::ReadGwtAsGal(const wxString& fname, GwtElement* WeightUtils::ReadGwt(const wxString& fname, TableInterface* table_int) { - using namespace std; #ifdef __WIN32__ - ifstream file(fname.wc_str()); + std::ifstream file(fname.wc_str()); #else - ifstream file; - file.open(GET_ENCODED_FILENAME(fname), ios::in); // a text file + std::ifstream file; + file.open(GET_ENCODED_FILENAME(fname), std::ios::in); // a text file #endif if (!(file.is_open() && file.good())) { @@ -643,17 +639,17 @@ GwtElement* WeightUtils::ReadGwt(const wxString& fname, // or : int (n_obs) bool use_rec_order = false; - string str; + std::string str; getline(file, str); - cout << str << endl; - stringstream ss(str, stringstream::in | stringstream::out); + std::cout << str << std::endl; + std::stringstream ss(str, std::stringstream::in | std::stringstream::out); wxInt64 num1 = 0; wxInt64 num2 = 0; wxInt64 num_obs = 0; - string dbf_name, t_key_field; + std::string dbf_name, t_key_field; - string line; + std::string line; std::getline(ss, line); wxString header(line); @@ -674,7 +670,7 @@ GwtElement* WeightUtils::ReadGwt(const wxString& fname, } else { ss.clear(); - ss.seekg(0, ios::beg); // reset to beginning + ss.seekg(0, std::ios::beg); // reset to beginning ss >> num1 >> num2 >> dbf_name >> t_key_field; } @@ -700,9 +696,9 @@ GwtElement* WeightUtils::ReadGwt(const wxString& fname, } file.clear(); - file.seekg(0, ios::beg); // reset to beginning + file.seekg(0, std::ios::beg); // reset to beginning getline(file, str); // skip header line - map id_map; + std::map id_map; if (use_rec_order) { // we need to traverse through every line of the file and // record the max and min values. So long as the max and min @@ -714,7 +710,7 @@ GwtElement* WeightUtils::ReadGwt(const wxString& fname, wxInt64 obs1=0, obs2=0; getline(file, str); if (!str.empty()) { - stringstream ss (str, stringstream::in | stringstream::out); + std::stringstream ss (str, std::stringstream::in | std::stringstream::out); ss >> obs1 >> obs2; if (obs1 < min_val) { min_val = obs1; @@ -759,7 +755,7 @@ GwtElement* WeightUtils::ReadGwt(const wxString& fname, } // get mapping from key_field to record ids (which always start // from 0 internally, but are displayed to the user from 1) - vector vec; + std::vector vec; table_int->GetColData(col, 0, vec); for (int i=0; i::iterator it; - map nbr_histogram; + std::map::iterator it; + std::map nbr_histogram; while (!file.eof()) { wxInt64 obs1=0; getline(file, str); if (!str.empty()) { - stringstream ss (str, stringstream::in | stringstream::out); + std::stringstream ss (str, std::stringstream::in | std::stringstream::out); ss >> obs1; it = nbr_histogram.find(obs1); @@ -795,10 +791,10 @@ GwtElement* WeightUtils::ReadGwt(const wxString& fname, GwtElement* gwt = new GwtElement[num_obs]; file.clear(); - file.seekg(0, ios::beg); // reset to beginning + file.seekg(0, std::ios::beg); // reset to beginning getline(file, str); // skip header line - map::iterator it1; - map::iterator it2; + std::map::iterator it1; + std::map::iterator it2; int line_num = 1; while (!file.eof()) { int gwt_obs1, gwt_obs2; @@ -806,7 +802,7 @@ GwtElement* WeightUtils::ReadGwt(const wxString& fname, double w_val; getline(file, str); if (!str.empty()) { - stringstream ss(str, stringstream::in | stringstream::out); + std::stringstream ss(str, std::stringstream::in | std::stringstream::out); ss >> obs1 >> obs2 >> w_val; it1 = id_map.find(obs1); it2 = id_map.find(obs2); diff --git a/ShapeOperations/WeightsManPtree.cpp b/ShapeOperations/WeightsManPtree.cpp index 38ef4c095..dd2904e23 100644 --- a/ShapeOperations/WeightsManPtree.cpp +++ b/ShapeOperations/WeightsManPtree.cpp @@ -69,7 +69,6 @@ void WeightsManPtree::ReadPtree(const boost::property_tree::ptree& pt, const wxString& proj_path) { using boost::property_tree::ptree; - using namespace std; weights_list.clear(); try { try { @@ -308,7 +307,6 @@ void WeightsManPtree::WritePtree(boost::property_tree::ptree& pt, const wxString& proj_path) { using boost::property_tree::ptree; - using namespace std; try { ptree& sub = pt.put("weights_entries", ""); diff --git a/ShapeOperations/WeightsManager.cpp b/ShapeOperations/WeightsManager.cpp index 964ed669d..e40461a46 100644 --- a/ShapeOperations/WeightsManager.cpp +++ b/ShapeOperations/WeightsManager.cpp @@ -304,7 +304,6 @@ void WeightsNewManager::GetNbrsExclCores(boost::uuids::uuid w_uuid, const std::set& cores, std::set& nbrs) { - using namespace std; nbrs.clear(); GalWeight* gw = GetGal(w_uuid); if (!gw || !gw->gal) return; diff --git a/SpatialIndAlgs.cpp b/SpatialIndAlgs.cpp index b8cf953d9..f9cff22db 100644 --- a/SpatialIndAlgs.cpp +++ b/SpatialIndAlgs.cpp @@ -91,7 +91,7 @@ void SpatialIndAlgs::default_test() // note: in Boost.Geometry WKT representation of a box is polygon // display results - stringstream ss; + std::stringstream ss; ss << "spatial query box:" << std::endl; ss << boost::geometry::wkt(query_box) << std::endl; ss << "spatial query result:" << std::endl; @@ -116,10 +116,10 @@ void SpatialIndAlgs::default_test() void SpatialIndAlgs::print_rtree_stats(rtree_box_2d_t& rtree) { - stringstream ss; - ss << "Rtree stats:" << endl; - ss << " size: " << rtree.size() << endl; - ss << " empty?: " << rtree.empty() << endl; + std::stringstream ss; + ss << "Rtree stats:" << std::endl; + ss << " size: " << rtree.size() << std::endl; + ss << " empty?: " << rtree.empty() << std::endl; box_2d bnds = rtree.bounds(); ss << " bounds: " << boost::geometry::wkt(bnds); } @@ -467,10 +467,10 @@ double SpatialIndAlgs::est_thresh_for_avg_num_neigh(const rtree_pt_2d_t& rtree, guess = lower + (upper-lower)/2.0; guess_avg = est_avg_num_neigh_thresh(rtree, guess); { - stringstream ss; - ss << "\niter: " << iters << " target avg: " << avg_n << endl; - ss << " lower: " << lower << ", lower_avg: " << lower_avg << endl; - ss << " guess: " << guess << ", guess_avg: " << guess_avg << endl; + std::stringstream ss; + ss << "\niter: " << iters << " target avg: " << avg_n << std::endl; + ss << " lower: " << lower << ", lower_avg: " << lower_avg << std::endl; + ss << " guess: " << guess << ", guess_avg: " << guess_avg << std::endl; ss << " upper: " << upper << ", upper_avg: " << upper_avg; } if (guess_avg == avg_n) { @@ -498,9 +498,9 @@ double SpatialIndAlgs::est_thresh_for_avg_num_neigh(const rtree_pt_2d_t& rtree, } } - stringstream ss; + std::stringstream ss; ss << "Estimated " << th << " threshold for average " - << "number neighbors " << avg_n << "." << endl; + << "number neighbors " << avg_n << "." << std::endl; ss << "Calculation time to peform " << iters << " iterations: " << sw.Time() << " ms."; //LOG_MSG("Exiting est_thresh_for_avg_num_neigh"); @@ -513,7 +513,7 @@ double SpatialIndAlgs::est_avg_num_neigh_thresh(const rtree_pt_2d_t& rtree, wxStopWatch sw; using namespace GenGeomAlgs; - vector query_pts; + std::vector query_pts; rtree.query(boost::geometry::index::intersects(rtree.bounds()), back_inserter(query_pts)); // Mersenne Twister random number generator, randomly seeded // with current time in seconds since Jan 1 1970. @@ -537,9 +537,9 @@ double SpatialIndAlgs::est_avg_num_neigh_thresh(const rtree_pt_2d_t& rtree, double avg = ((double) tot_neigh) / ((double) trials); - stringstream ss; + std::stringstream ss; ss << "Estimated " << avg << " neighbors on average for " - << "threshold " << th << "." << endl; + << "threshold " << th << "." << std::endl; ss << "Time to perform " << trials << " random trials: " << sw.Time() << " ms."; //LOG_MSG(ss.str()); @@ -579,7 +579,7 @@ double SpatialIndAlgs::est_mean_distance(const std::vector& x, } smp_cnt = max_iters; } - stringstream ss; + std::stringstream ss; ss << "est_mean_distance finished in " << sw.Time() << " ms."; return sum/smp_cnt; } @@ -593,7 +593,7 @@ double SpatialIndAlgs::est_median_distance(const std::vector& x, if (x.size() != y.size() || x.size() == 0 || y.size() == 0) { return -1; } const size_t pts_sz = x.size(); const size_t all_pairs_sz = (pts_sz*(pts_sz-1))/2; - vector v; + std::vector v; if (all_pairs_sz <= max_iters) { v.resize((pts_sz*(pts_sz-1))/2); @@ -619,14 +619,14 @@ double SpatialIndAlgs::est_median_distance(const std::vector& x, v[t] = (is_arc ? ComputeArcDistRad(x[i], y[i], x[j], y[j]) : ComputeEucDist(x[i], y[i], x[j], y[j])); if (!Gda::is_finite(v[t]) || Gda::is_nan(v[t])) { - stringstream ss; + std::stringstream ss; ss << "d(i="< q; rtree.query(boost::geometry::index::intersects(b), std::back_inserter(q)); size_t lcnt = 0; - list l; + std::list l; BOOST_FOREACH(pt_2d_val const& w, q) { if (w.second != v.second && boost::geometry::distance(v.first, w.first) <= th) @@ -744,9 +744,9 @@ GwtWeight* SpatialIndAlgs::thresh_build(const rtree_pt_2d_t& rtree, double th, d apply_kernel(Wp, kernel, use_kernel_diagnals); } - stringstream ss; + std::stringstream ss; ss << "Time to create " << th << " threshold GwtWeight," - << endl << " with " << cnt << " total neighbors in ms : " + << std::endl << " with " << cnt << " total neighbors in ms : " << sw.Time(); return Wp; } @@ -757,7 +757,7 @@ double SpatialIndAlgs::est_avg_num_neigh_thresh(const rtree_pt_3d_t& rtree, wxStopWatch sw; using namespace GenGeomAlgs; - vector query_pts; + std::vector query_pts; rtree.query(boost::geometry::index::intersects(rtree.bounds()), back_inserter(query_pts)); // Mersenne Twister random number generator, randomly seeded // with current time in seconds since Jan 1 1970. @@ -780,9 +780,9 @@ double SpatialIndAlgs::est_avg_num_neigh_thresh(const rtree_pt_3d_t& rtree, } } double avg = ((double) tot_neigh) / ((double) trials); - stringstream ss; + std::stringstream ss; ss << "Estimated " << avg << " neighbors on average for " - << "threshold " << th << "." << endl; + << "threshold " << th << "." << std::endl; ss << "Time to perform " << trials << " random trials: " << sw.Time() << " ms."; return avg; @@ -802,13 +802,13 @@ GwtWeight* SpatialIndAlgs::thresh_build(const rtree_pt_3d_t& rtree, double th, d Wp->gwt = new GwtElement[Wp->num_obs]; { - stringstream ss; - ss << "In thresh_build for unit sphere" << endl; - ss << "th : " << th << endl; - ss << "Input th (unit sphere secant distance): " << th << endl; + std::stringstream ss; + ss << "In thresh_build for unit sphere" << std::endl; + ss << "th : " << th << std::endl; + ss << "Input th (unit sphere secant distance): " << th << std::endl; double r = UnitDistToRad(th); - ss << "Input th (unit sphere rad): " << r << endl; - ss << "Input th (earth km): " << EarthRadToKm(r) << endl; + ss << "Input th (unit sphere rad): " << r << std::endl; + ss << "Input th (earth km): " << EarthRadToKm(r) << std::endl; ss << "Input th (earth mi): " << EarthRadToMi(r); } int cnt=0; @@ -827,7 +827,7 @@ GwtWeight* SpatialIndAlgs::thresh_build(const rtree_pt_3d_t& rtree, double th, d std::vector q; rtree.query(boost::geometry::index::intersects(b), std::back_inserter(q)); size_t lcnt = 0; - list l; + std::list l; BOOST_FOREACH(pt_3d_val const& w, q) { if (w.second != v.second && boost::geometry::distance(v.first, w.first) <= th) @@ -868,9 +868,9 @@ GwtWeight* SpatialIndAlgs::thresh_build(const rtree_pt_3d_t& rtree, double th, d } } - stringstream ss; + std::stringstream ss; ss << "Time to create arc " << th << " threshold GwtWeight," - << endl << " with " << cnt << " total neighbors in ms : " + << std::endl << " with " << cnt << " total neighbors in ms : " << sw.Time(); if (!kernel.IsEmpty()) { @@ -920,7 +920,7 @@ void SpatialIndAlgs::get_pt_rtree_stats(const rtree_pt_2d_t& rtree, wxStopWatch sw; const int k=2; size_t obs = rtree.size(); - vector d(obs); + std::vector d(obs); for (rtree_pt_2d_t::const_query_iterator it = rtree.qbegin(boost::geometry::index::intersects(rtree.bounds())); it != rtree.qend() ; ++it) @@ -941,12 +941,12 @@ void SpatialIndAlgs::get_pt_rtree_stats(const rtree_pt_2d_t& rtree, for (size_t i=0; i d(obs); + std::vector d(obs); for (rtree_pt_3d_t::const_query_iterator it = rtree.qbegin(boost::geometry::index::intersects(rtree.bounds())); it != rtree.qend() ; ++it) @@ -984,24 +984,24 @@ void SpatialIndAlgs::get_pt_rtree_stats(const rtree_pt_3d_t& rtree, for (size_t i=0; i& hs, +void TemplateCanvas::helper_DrawSelectableShapes_dc(wxDC &dc, std::vector& hs, bool hl_only, bool revert, bool crosshatch, bool is_print, @@ -901,7 +901,7 @@ void TemplateCanvas::helper_DrawSelectableShapes_dc(wxDC &dc, vector& hs, if (selectable_shps_type == points) { int bnd = w*h; - vector dirty(bnd, false); + std::vector dirty(bnd, false); dc.SetBrush(*wxTRANSPARENT_BRUSH); GdaPoint* p; @@ -920,7 +920,7 @@ void TemplateCanvas::helper_DrawSelectableShapes_dc(wxDC &dc, vector& hs, } dc.SetBrush(cat_data.GetCategoryBrush(cc_ts, cat)); } - vector& ids = cat_data.GetIdsRef(cc_ts, cat); + std::vector& ids = cat_data.GetIdsRef(cc_ts, cat); for (size_t i=0, iend=ids.size(); i& hs, } dc.SetBrush(cat_data.GetCategoryBrush(cc_ts, cat)); } - vector& ids = cat_data.GetIdsRef(cc_ts, cat); + std::vector& ids = cat_data.GetIdsRef(cc_ts, cat); for (int i=0, iend=ids.size(); i& hs, wxBrush brush = cat_data.GetCategoryBrush(cc_ts, cat); dc.SetBrush(brush); } - vector& ids = cat_data.GetIdsRef(cc_ts, cat); + std::vector& ids = cat_data.GetIdsRef(cc_ts, cat); for (int i=0, iend=ids.size(); i& hs, if (fixed_pen_color != *wxWHITE) { dc.SetPen(wxPen(fixed_pen_color)); } - vector& ids = cat_data.GetIdsRef(cc_ts, cat); + std::vector& ids = cat_data.GetIdsRef(cc_ts, cat); for (int i=0, iend=ids.size(); i& hs,int alpha, wxColour fixed_pen_color, bool cross_hatch) +void TemplateCanvas::DrawCircles(wxGCDC& dc, CatClassifData& cat_data, std::vector& hs,int alpha, wxColour fixed_pen_color, bool cross_hatch) { //int alpha = GdaConst::plot_transparency_unhighlighted;; int cc_ts = cat_data.curr_canvas_tm_step; @@ -1253,7 +1253,7 @@ void TemplateCanvas::helper_DrawSelectableShapes_gc(wxGraphicsContext &gc, if (selectable_shps_type == points) { int bnd = w*h; - vector dirty(bnd, false); + std::vector dirty(bnd, false); GdaPoint* p; for (int cat=0; cat& TemplateCanvas::GetSelBitVec() +std::vector& TemplateCanvas::GetSelBitVec() { return highlight_state->GetHighlight(); } @@ -1691,7 +1691,7 @@ void TemplateCanvas::SetNumNewlySel(int n) // Returns list of newly selected objects. Only indexes // 0 through GetNumNewlySel()-1 are valid. -vector& TemplateCanvas::GetNewlySelList() +std::vector& TemplateCanvas::GetNewlySelList() { return highlight_state->GetNewlyHighlighted(); } @@ -1709,7 +1709,7 @@ void TemplateCanvas::SetNumNewlyUnsel(int n) // Returns list of newly unselected objects. Only indexes // 0 through GetNumNewlyUnsel()-1 are valid. -vector& TemplateCanvas::GetNewlyUnselList() +std::vector& TemplateCanvas::GetNewlyUnselList() { return highlight_state->GetNewlyUnhighlighted(); } @@ -1729,9 +1729,9 @@ void TemplateCanvas::AppendCustomCategories(wxMenu* menu, { // search for ID_CAT_CLASSIF_A(B,C)_MENU submenus const int num_sub_menus=3; - vector menu_id(num_sub_menus); - vector sub_menu_id(num_sub_menus); - vector base_id(num_sub_menus); + std::vector menu_id(num_sub_menus); + std::vector sub_menu_id(num_sub_menus); + std::vector base_id(num_sub_menus); menu_id[0] = XRCID("ID_NEW_CUSTOM_CAT_CLASSIF_A"); menu_id[1] = XRCID("ID_NEW_CUSTOM_CAT_CLASSIF_B"); // conditional horizontal menu menu_id[2] = XRCID("ID_NEW_CUSTOM_CAT_CLASSIF_C"); // conditional verticle menu @@ -1762,7 +1762,7 @@ void TemplateCanvas::AppendCustomCategories(wxMenu* menu, _("Create new custom categories classification.")); sm->AppendSeparator(); - vector titles; + std::vector titles; ccm->GetTitles(titles); for (size_t j=0; jAppend(base_id[i]+j, titles[j]); @@ -1831,7 +1831,7 @@ void TemplateCanvas::UpdateSelectionPoints(bool shiftdown, bool pointsel) int hl_size = GetSelBitVec().size(); if (hl_size != selectable_shps.size()) return; - vector& hs = GetSelBitVec(); + std::vector& hs = GetSelBitVec(); bool selection_changed = false; if (pointsel) { // a point selection @@ -1973,7 +1973,7 @@ void TemplateCanvas::UpdateSelectionCircles(bool shiftdown, bool pointsel) int hl_size = GetSelBitVec().size(); if (hl_size != selectable_shps.size()) return; - vector& hs = GetSelBitVec(); + std::vector& hs = GetSelBitVec(); bool selection_changed = false; if (pointsel) { // a point selection @@ -2121,7 +2121,7 @@ void TemplateCanvas::UpdateSelectionPolylines(bool shiftdown, bool pointsel) int hl_size = GetSelBitVec().size(); if (hl_size != selectable_shps.size()) return; - vector& hs = GetSelBitVec(); + std::vector& hs = GetSelBitVec(); bool selection_changed = false; GdaPolyLine* p; @@ -2313,11 +2313,11 @@ void TemplateCanvas::SelectAllInCategory(int category, int hl_size = highlight_state->GetHighlightSize(); if (hl_size != selectable_shps.size()) return; - vector& hs = highlight_state->GetHighlight(); + std::vector& hs = highlight_state->GetHighlight(); bool selection_changed = false; - vector obs_in_cat(hl_size, false); - vector& ids = cat_data.GetIdsRef(cc_ts, category); + std::vector obs_in_cat(hl_size, false); + std::vector& ids = cat_data.GetIdsRef(cc_ts, category); for (int i=0, iend=ids.size(); i TemplateCanvas::SaveCategories(const wxString& title, { std::vector new_fields; if (project->GetNumRecords() != selectable_shps.size()) return new_fields; - vector data(1); + std::vector data(1); int cc_ts = cat_data.curr_canvas_tm_step; int num_cats = cat_data.GetNumCategories(cc_ts); - vector dt(selectable_shps.size()); + std::vector dt(selectable_shps.size()); data[0].type = GdaConst::long64_type; data[0].l_val = &dt; @@ -2447,7 +2447,7 @@ std::vector TemplateCanvas::SaveCategories(const wxString& title, data[0].undefined = &undefs; for (int cat=0; cat& ids = cat_data.GetIdsRef(cc_ts, cat); + std::vector& ids = cat_data.GetIdsRef(cc_ts, cat); for (int i=0, iend=ids.size(); i TemplateCanvas::SaveCategories(const wxString& title, } -void TemplateCanvas::GetVizInfo(map >& colors) +void TemplateCanvas::GetVizInfo(std::map >& colors) { int cc_ts = cat_data.curr_canvas_tm_step; int num_cats=cat_data.GetNumCategories(cc_ts); @@ -2471,10 +2471,10 @@ void TemplateCanvas::GetVizInfo(map >& colors) wxColour brushClr = cat_data.GetCategoryBrush(cc_ts, cat).GetColour(); wxString clr = GdaColorUtils::ToHexColorStr(brushClr); - vector ids_copy; + std::vector ids_copy; colors[clr] = ids_copy; - vector& ids = cat_data.GetIdsRef(cc_ts, cat); + std::vector& ids = cat_data.GetIdsRef(cc_ts, cat); for (int i=0, iend=ids.size(); i& hs, + std::vector& hs, bool hl_only=false, bool revert=false, bool crosshatch= false, bool is_print = false, const wxColour& fixed_pen_color = *wxWHITE); void helper_DrawSelectableShapes_gc(wxGraphicsContext &gc, - vector& hs, + std::vector& hs, bool hl_only=false, bool revert=false, bool crosshatch= false, int alpha=255); - void DrawPoints(wxGCDC& dc, CatClassifData& cat_data, vector& hs, + void DrawPoints(wxGCDC& dc, CatClassifData& cat_data, std::vector& hs, double radius, int alpha = 255, wxColour fixed_pen_color = *wxWHITE, bool cross_hatch = false); - void DrawPolygons(wxGCDC& dc, CatClassifData& cat_data, vector& hs, + void DrawPolygons(wxGCDC& dc, CatClassifData& cat_data, std::vector& hs, int alpha = 255, wxColour fixed_pen_color = *wxWHITE, bool cross_hatch = false); - void DrawCircles(wxGCDC& dc, CatClassifData& cat_data, vector& hs, + void DrawCircles(wxGCDC& dc, CatClassifData& cat_data, std::vector& hs, int alpha = 255, wxColour fixed_pen_color = *wxWHITE, bool cross_hatch = false); - void DrawLines(wxGCDC& dc, CatClassifData& cat_data, vector& hs, + void DrawLines(wxGCDC& dc, CatClassifData& cat_data, std::vector& hs, int alpha = 255, wxColour fixed_pen_color = *wxWHITE, bool cross_hatch = false); diff --git a/VarCalc/CalcHelp.cpp b/VarCalc/CalcHelp.cpp index f38eb0ddd..ada7b0a80 100644 --- a/VarCalc/CalcHelp.cpp +++ b/VarCalc/CalcHelp.cpp @@ -28,7 +28,6 @@ std::map CalcHelp::dict; void CalcHelp::init() { - using namespace std; typedef CalcHelpEntry::StrPair CSP; typedef CalcHelpEntry::ArgPair ARG; ARG bool_arg("boolean"); diff --git a/VarCalc/GdaParser.cpp b/VarCalc/GdaParser.cpp index 83caaaa81..26863452a 100644 --- a/VarCalc/GdaParser.cpp +++ b/VarCalc/GdaParser.cpp @@ -61,7 +61,6 @@ GdaFVSmtPtr GdaParser::expression() GdaFVSmtPtr GdaParser::logical_xor_expr() { - using namespace std; GdaFVSmtPtr left = logical_or_expr(); for (;;) { @@ -77,7 +76,6 @@ GdaFVSmtPtr GdaParser::logical_xor_expr() GdaFVSmtPtr GdaParser::logical_or_expr() { - using namespace std; GdaFVSmtPtr left = logical_and_expr(); for (;;) { @@ -93,7 +91,6 @@ GdaFVSmtPtr GdaParser::logical_or_expr() GdaFVSmtPtr GdaParser::logical_and_expr() { - using namespace std; GdaFVSmtPtr left = logical_not_expr(); for (;;) { @@ -155,7 +152,6 @@ GdaFVSmtPtr GdaParser::comp_expr() GdaFVSmtPtr GdaParser::add_expr() { - using namespace std; GdaFVSmtPtr left = mult_expr(); for (;;) { diff --git a/VarTools.cpp b/VarTools.cpp index c605ce6b9..eacc1b243 100644 --- a/VarTools.cpp +++ b/VarTools.cpp @@ -190,9 +190,8 @@ void Manager::SetFixedScale(int var, bool fixed) double Manager::GetMinOverAllTms(int var) { - using namespace std; if (var < 0 || var >= vars.size()) return NaN; - vector::iterator i = min_element(vars[var].min_vals.begin(), + std::vector::iterator i = min_element(vars[var].min_vals.begin(), vars[var].min_vals.end()); if (i == vars[var].min_vals.end()) return NaN; return (*i); @@ -200,9 +199,8 @@ double Manager::GetMinOverAllTms(int var) double Manager::GetMaxOverAllTms(int var) { - using namespace std; if (var < 0 || var >= vars.size()) return NaN; - vector::iterator i = max_element(vars[var].max_vals.begin(), + std::vector::iterator i = max_element(vars[var].max_vals.begin(), vars[var].max_vals.end()); if (i == vars[var].max_vals.end()) return NaN; return (*i); @@ -210,12 +208,11 @@ double Manager::GetMaxOverAllTms(int var) double Manager::GetMinWithinPossibleTms(int var) { - using namespace std; if (var < 0 || var >= vars.size()) return NaN; if (!IsSyncWithGlobalTm(var)) return vars[var].min_vals[vars[var].time]; int min_tm = OffsetFromMinSyncedTm(var); int max_tm = min_tm + CurPossibleSynchedTmRange(); - vector::iterator i = min_element(vars[var].min_vals.begin()+min_tm, + std::vector::iterator i = min_element(vars[var].min_vals.begin()+min_tm, vars[var].min_vals.begin()+max_tm+1); if (i == vars[var].min_vals.end()) return NaN; return (*i); @@ -223,13 +220,12 @@ double Manager::GetMinWithinPossibleTms(int var) double Manager::GetMaxWithinPossibleTms(int var) { - using namespace std; if (var < 0 || var >= vars.size()) return NaN; if (!IsSyncWithGlobalTm(var)) return vars[var].max_vals[vars[var].time]; int min_tm = OffsetFromMinSyncedTm(var); int max_tm = min_tm + CurPossibleSynchedTmRange(); - vector::iterator i = max_element(vars[var].max_vals.begin()+min_tm, + std::vector::iterator i = max_element(vars[var].max_vals.begin()+min_tm, vars[var].max_vals.begin()+max_tm+1); if (i == vars[var].max_vals.end()) return NaN; return (*i); @@ -237,14 +233,12 @@ double Manager::GetMaxWithinPossibleTms(int var) double Manager::GetMinCurTm(int var) { - using namespace std; if (var < 0 || var >= vars.size()) return NaN; return vars[var].min_vals[vars[var].time]; } double Manager::GetMaxCurTm(int var) { - using namespace std; if (var < 0 || var >= vars.size()) return NaN; return vars[var].max_vals[vars[var].time]; } diff --git a/io/arcgis_swm.cpp b/io/arcgis_swm.cpp index 0198666ec..9a3f8704d 100644 --- a/io/arcgis_swm.cpp +++ b/io/arcgis_swm.cpp @@ -11,9 +11,7 @@ #include "weights_interface.h" #include "arcgis_swm.h" -using namespace std; - -bool iequals(const string& a, const string& b) +bool iequals(const std::string& a, const std::string& b) { unsigned int sz = a.size(); if (b.size() != sz) @@ -27,18 +25,18 @@ bool iequals(const string& a, const string& b) wxString ReadIdFieldFromSwm(const wxString& fname) { #ifdef __WIN32__ - ifstream istream; - istream.open(fname.wc_str(), ios::binary|ios::in); + std::ifstream istream; + istream.open(fname.wc_str(), std::ios::binary|std::ios::in); #else - ifstream istream; - istream.open(GET_ENCODED_FILENAME(fname), ios::binary|ios::in); // a text file + std::ifstream istream; + istream.open(GET_ENCODED_FILENAME(fname), std::ios::binary|std::ios::in); // a text file #endif if (!(istream.is_open() && istream.good())) { return wxEmptyString; } // first line - string line; + std::string line; // ID_VAR_NAME;ESRI_SRS\n getline(istream, line, '\n'); @@ -64,11 +62,11 @@ wxString ReadIdFieldFromSwm(const wxString& fname) GalElement* ReadSwmAsGal(const wxString& fname, TableInterface* table_int) { #ifdef __WIN32__ - ifstream istream; - istream.open(fname.wc_str(), ios::binary|ios::in); + std::ifstream istream; + istream.open(fname.wc_str(), std::ios::binary|std::ios::in); #else - ifstream istream; - istream.open(GET_ENCODED_FILENAME(fname), ios::binary|ios::in); // a text file + std::ifstream istream; + istream.open(GET_ENCODED_FILENAME(fname), std::ios::binary|std::ios::in); // a text file #endif if (!(istream.is_open() && istream.good())) { @@ -76,9 +74,9 @@ GalElement* ReadSwmAsGal(const wxString& fname, TableInterface* table_int) } // first line // ID_VAR_NAME;ESRI_SRS\n - string line; + std::string line; getline(istream, line, '\n'); - string id_name = line.substr(0, line.find(';')); + std::string id_name = line.substr(0, line.find(';')); int swmType = 0; // old bool fixed = false; @@ -93,7 +91,7 @@ GalElement* ReadSwmAsGal(const wxString& fname, TableInterface* table_int) } int pos = line.find("FIXEDWEIGHTS@"); if (pos > 0) { - string fixed_w = line.substr(pos+13, 4); + std::string fixed_w = line.substr(pos+13, 4); if (iequals(fixed_w, "True")) { fixed = true; } @@ -132,8 +130,8 @@ GalElement* ReadSwmAsGal(const wxString& fname, TableInterface* table_int) istream.read((char*)&row_std, 4); - vector > nbr_ids(no_obs); - vector > nbr_ws(no_obs); + std::vector > nbr_ids(no_obs); + std::vector > nbr_ws(no_obs); for (int i=0; i& n_ids = nbr_ids[i]; - vector& n_w = nbr_ws[i]; + std::vector& n_ids = nbr_ids[i]; + std::vector& n_w = nbr_ws[i]; for (int j=0; j des = mmr.dataElements(); - // cout << des[0]->dataType() << endl; + std::vector des = mmr.dataElements(); + // cout << des[0]->dataType() << std::endl; DataElement* de = des[0]; CompressedDataElement* cde; if (des[0]->dataType() == miCOMPRESSED) { @@ -54,7 +52,7 @@ GalElement* ReadMatAsGal(const wxString& fname, TableInterface* table_int) // get row & col # MatrixDataElement* mde = (MatrixDataElement*)de; DimensionsArray* da = mde->dimensionsArray(); - vector& dim = da->dimensions(); + std::vector& dim = da->dimensions(); if (dim.size() != 2) { throw WeightsNotValidException(); } @@ -73,28 +71,28 @@ GalElement* ReadMatAsGal(const wxString& fname, TableInterface* table_int) GalElement* gal = new GalElement[num_obs]; // get weights matrix - vector data(num_obs * num_obs); + std::vector data(num_obs * num_obs); NumericArray* sde = (NumericArray*)mde; DataElement* real = sde->real(); EDataType dt = real->dataType(); if (dt == miSINGLE) { // float FlatDataElement* flatdata = ( FlatDataElement*)real; - vector& _data = flatdata->data(); + std::vector& _data = flatdata->data(); for (int i=0; i< data.size(); i++) { data[i] = _data[i]; } } else if (dt == miDOUBLE) { // double FlatDataElement* flatdata = ( FlatDataElement*)real; - vector& _data = flatdata->data(); + std::vector& _data = flatdata->data(); for (int i=0; i< data.size(); i++) { data[i] = _data[i]; } } else { // INT8 UINT8 INT16 UINT16 INT32 UINT32 FlatDataElement* flatdata = ( FlatDataElement*)real; - vector& _data = flatdata->data(); + std::vector& _data = flatdata->data(); for (int i=0; i< data.size(); i++) { data[i] = _data[i]; } diff --git a/io/matlab_mat.h b/io/matlab_mat.h index c6026ed34..9a14ea9f4 100644 --- a/io/matlab_mat.h +++ b/io/matlab_mat.h @@ -5,8 +5,6 @@ #include "../ShapeOperations/GalWeight.h" -using namespace std; - wxString ReadIdFieldFromMat(const wxString& fname); GalElement* ReadMatAsGal(const wxString& fname, TableInterface* table_int); diff --git a/version.h b/version.h index 126a693b1..37411b815 100644 --- a/version.h +++ b/version.h @@ -2,10 +2,10 @@ namespace Gda { const int version_major = 1; const int version_minor = 22; const int version_build = 0; - const int version_subbuild = 0; + const int version_subbuild = 2; const int version_year = 2023; - const int version_month = 7; - const int version_day = 12; + const int version_month = 8; + const int version_day = 18; const int version_night = 0; const int version_type = 2; // 0: alpha, 1: beta, 2: release } // namespace Gda
D.F.