zhm-real 5 gadi atpakaļ
vecāks
revīzija
bc92b39c90

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 3 - 0
Search-based Planning/.idea/shelf/Uncommitted_changes_before_Update_at_6_27_20,_12_26_AM_[Default_Changelist]/shelved.patch


+ 4 - 0
Search-based Planning/.idea/shelf/Uncommitted_changes_before_Update_at_6_27_20__12_26_AM__Default_Changelist_.xml

@@ -0,0 +1,4 @@
+<changelist name="Uncommitted_changes_before_Update_at_6_27_20,_12_26_AM_[Default_Changelist]" date="1593242806212" recycled="true" deleted="true">
+  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_6_27_20,_12_26_AM_[Default_Changelist]/shelved.patch" />
+  <option name="DESCRIPTION" value="Uncommitted changes before Update at 6/27/20, 12:26 AM [Default Changelist]" />
+</changelist>

+ 24 - 10
Search-based Planning/.idea/workspace.xml

@@ -20,9 +20,19 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="025aff36-a6aa-4945-ab7e-b2c625055f47" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_6_27_20,_12_26_AM_[Default_Changelist]/shelved.patch" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_6_27_20__12_26_AM__Default_Changelist_.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/../nano.save" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/../nano.save.1" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ara_star.py" beforeDir="false" afterPath="$PROJECT_DIR$/ara_star.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/plotting.py" beforeDir="false" afterPath="$PROJECT_DIR$/plotting.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/a_star.py" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/ara_star.py" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/bfs.py" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/dfs.py" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/dijkstra.py" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/env.py" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/plotting.py" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/queue.py" beforeDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -202,25 +212,29 @@
     </state>
     <state x="2700" y="297" width="424" height="482" key="FileChooserDialogImpl/65.24.1855.1056/1920.0.1920.1080@1920.0.1920.1080" timestamp="1592802293738" />
     <state x="819" y="314" key="FileChooserDialogImpl/65.24.1855.1056/1920.0.1920.1080@65.24.1855.1056" timestamp="1592933974409" />
-    <state width="1832" height="206" key="GridCell.Tab.0.bottom" timestamp="1593242428508">
+    <state width="1832" height="206" key="GridCell.Tab.0.bottom" timestamp="1593243345942">
       <screen x="1920" y="0" width="1920" height="1080" />
     </state>
-    <state width="1832" height="206" key="GridCell.Tab.0.bottom/65.24.1855.1056/1920.0.1920.1080@1920.0.1920.1080" timestamp="1593242428508" />
-    <state width="1832" height="206" key="GridCell.Tab.0.center" timestamp="1593242428508">
+    <state width="1832" height="206" key="GridCell.Tab.0.bottom/65.24.1855.1056/1920.0.1920.1080@1920.0.1920.1080" timestamp="1593243345942" />
+    <state width="1832" height="206" key="GridCell.Tab.0.center" timestamp="1593243345941">
       <screen x="1920" y="0" width="1920" height="1080" />
     </state>
-    <state width="1832" height="206" key="GridCell.Tab.0.center/65.24.1855.1056/1920.0.1920.1080@1920.0.1920.1080" timestamp="1593242428508" />
-    <state width="1832" height="206" key="GridCell.Tab.0.left" timestamp="1593242428508">
+    <state width="1832" height="206" key="GridCell.Tab.0.center/65.24.1855.1056/1920.0.1920.1080@1920.0.1920.1080" timestamp="1593243345941" />
+    <state width="1832" height="206" key="GridCell.Tab.0.left" timestamp="1593243345941">
       <screen x="1920" y="0" width="1920" height="1080" />
     </state>
-    <state width="1832" height="206" key="GridCell.Tab.0.left/65.24.1855.1056/1920.0.1920.1080@1920.0.1920.1080" timestamp="1593242428508" />
-    <state width="1832" height="206" key="GridCell.Tab.0.right" timestamp="1593242428508">
+    <state width="1832" height="206" key="GridCell.Tab.0.left/65.24.1855.1056/1920.0.1920.1080@1920.0.1920.1080" timestamp="1593243345941" />
+    <state width="1832" height="206" key="GridCell.Tab.0.right" timestamp="1593243345941">
       <screen x="1920" y="0" width="1920" height="1080" />
     </state>
-    <state width="1832" height="206" key="GridCell.Tab.0.right/65.24.1855.1056/1920.0.1920.1080@1920.0.1920.1080" timestamp="1593242428508" />
+    <state width="1832" height="206" key="GridCell.Tab.0.right/65.24.1855.1056/1920.0.1920.1080@1920.0.1920.1080" timestamp="1593243345941" />
     <state x="2406" y="174" key="SettingsEditor" timestamp="1592801555194">
       <screen x="1920" y="0" width="1920" height="1080" />
     </state>
     <state x="2406" y="174" key="SettingsEditor/65.24.1855.1056/1920.0.1920.1080@1920.0.1920.1080" timestamp="1592801555194" />
+    <state x="2701" y="438" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1593242832142">
+      <screen x="1920" y="0" width="1920" height="1080" />
+    </state>
+    <state x="2701" y="438" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/65.24.1855.1056/1920.0.1920.1080@1920.0.1920.1080" timestamp="1593242832142" />
   </component>
 </project>

BIN
Search-based Planning/Search_2D/__pycache__/env.cpython-37.pyc


BIN
Search-based Planning/Search_2D/__pycache__/plotting.cpython-37.pyc


BIN
Search-based Planning/Search_2D/__pycache__/queue.cpython-37.pyc


+ 14 - 3
Search-based Planning/a_star.py → Search-based Planning/Search_2D/a_star.py

@@ -1,6 +1,17 @@
-import queue
-import plotting
-import env
+"""
+A_star 2D
+@author: huiming zhou
+"""
+
+import os
+import sys
+
+sys.path.append(os.path.dirname(os.path.abspath(__file__)) +
+                "/../../Search-based Planning/")
+
+from Search_2D import queue
+from Search_2D import plotting
+from Search_2D import env
 
 
 class Astar:

+ 13 - 4
Search-based Planning/ara_star.py → Search-based Planning/Search_2D/ara_star.py

@@ -1,8 +1,17 @@
-import queue
-import plotting
-import env
+"""
+ARA_star 2D
+@author: huiming zhou
+"""
 
-import matplotlib.pyplot as plt
+import os
+import sys
+
+sys.path.append(os.path.dirname(os.path.abspath(__file__)) +
+                "/../../Search-based Planning/")
+
+from Search_2D import queue
+from Search_2D import plotting
+from Search_2D import env
 
 
 class AraStar:

+ 14 - 3
Search-based Planning/bfs.py → Search-based Planning/Search_2D/bfs.py

@@ -1,6 +1,17 @@
-import queue
-import plotting
-import env
+"""
+BFS 2D
+@author: huiming zhou
+"""
+
+import os
+import sys
+
+sys.path.append(os.path.dirname(os.path.abspath(__file__)) +
+                "/../../Search-based Planning/")
+
+from Search_2D import queue
+from Search_2D import plotting
+from Search_2D import env
 
 
 class BFS:

+ 14 - 3
Search-based Planning/dfs.py → Search-based Planning/Search_2D/dfs.py

@@ -1,6 +1,17 @@
-import queue
-import plotting
-import env
+"""
+DFS 2D
+@author: huiming zhou
+"""
+
+import os
+import sys
+
+sys.path.append(os.path.dirname(os.path.abspath(__file__)) +
+                "/../../Search-based Planning/")
+
+from Search_2D import queue
+from Search_2D import plotting
+from Search_2D import env
 
 
 class DFS:

+ 13 - 3
Search-based Planning/dijkstra.py → Search-based Planning/Search_2D/dijkstra.py

@@ -1,7 +1,17 @@
-import queue
-import env
-import plotting
+"""
+Dijkstra 2D
+@author: huiming zhou
+"""
 
+import os
+import sys
+
+sys.path.append(os.path.dirname(os.path.abspath(__file__)) +
+                "/../../Search-based Planning/")
+
+from Search_2D import queue
+from Search_2D import plotting
+from Search_2D import env
 
 class Dijkstra:
     def __init__(self, x_start, x_goal):

+ 6 - 0
Search-based Planning/env.py → Search-based Planning/Search_2D/env.py

@@ -1,3 +1,9 @@
+"""
+Env 2D
+@author: huiming zhou
+"""
+
+
 class Env:
     def __init__(self):
         self.x_range = 51  # size of background

+ 12 - 1
Search-based Planning/plotting.py → Search-based Planning/Search_2D/plotting.py

@@ -1,5 +1,16 @@
+"""
+Plot tools 2D
+@author: huiming zhou
+"""
+
+import os
+import sys
 import matplotlib.pyplot as plt
-import env
+
+sys.path.append(os.path.dirname(os.path.abspath(__file__)) +
+                "/../../Search-based Planning/")
+
+from Search_2D import env
 
 
 class Plotting:

+ 0 - 0
Search-based Planning/queue.py → Search-based Planning/Search_2D/queue.py


+ 1 - 0
nano.save

@@ -0,0 +1 @@
+

+ 1 - 0
nano.save.1

@@ -0,0 +1 @@
+

Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels