Merge conflict

yanshi1 · Mar 1, 2019 · 9c84c71 · 9c84c71
2 parents b8e07cc + 1a51d90
commit 9c84c71
Show file tree

Hide file tree

Showing 462 changed files with 4,953 additions and 2,397 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -2,3 +2,6 @@
 	path = third_party/uncrustify
 	url = https://github.com/uncrustify/uncrustify.git
 	branch = uncrustify-0.66.1
+[submodule "third_party/namanager"]
+	path = third_party/namanager
+	url = https://github.com/iattempt/namanager.git
diff --git a/.travis.yml b/.travis.yml
@@ -54,6 +54,15 @@ matrix:
       env:
         - MATRIX_EVAL="CXX=g++-7"
 
+    # Verify file name
+    - os: linux
+      language: python
+      python:
+        - "3.6"
+      script:
+        - pip install namanager
+        - namanager -s third_party/namanager_settings.json --required
+
     # Check formatting of Python code
     - os: linux
       language: python

diff --git a/...elligence/src/DBSCAN_Clustering/dbscan.py → ...elligence/src/dbscan_clustering/dbscan.py b/...elligence/src/DBSCAN_Clustering/dbscan.py → ...elligence/src/dbscan_clustering/dbscan.py
diff --git a/...elligence/src/DBSCAN_Clustering/readme.md → ...elligence/src/dbscan_clustering/readme.md b/...elligence/src/DBSCAN_Clustering/readme.md → ...elligence/src/dbscan_clustering/readme.md
diff --git a/...n_tree/Decision_Trees_Information_Gain.py → ...n_tree/decision_trees_information_gain.py b/...n_tree/Decision_Trees_Information_Gain.py → ...n_tree/decision_trees_information_gain.py
diff --git a/...ence/src/hierachical-clustering/README.md → ...ence/src/hierachical_clustering/README.md b/...ence/src/hierachical-clustering/README.md → ...ence/src/hierachical_clustering/README.md
diff --git a/...cal-clustering/hierachical_clustering.cpp → ...cal_clustering/hierachical_clustering.cpp b/...cal-clustering/hierachical_clustering.cpp → ...cal_clustering/hierachical_clustering.cpp
diff --git a/...-clustering/Hierarchical_Clustering.ipynb → ..._clustering/hierarchical_clustering.ipynb b/...-clustering/Hierarchical_Clustering.ipynb → ..._clustering/hierarchical_clustering.ipynb
diff --git a/code/artificial_intelligence/src/image_processing/Canny/canny.cpp b/code/artificial_intelligence/src/image_processing/Canny/canny.cpp