Fix

kumpy · May 19, 2019 · 6d40d1b · 6d40d1b
1 parent d757281
commit 6d40d1b
Show file tree

Hide file tree

Showing 44 changed files with 57,818 additions and 113 deletions.
diff --git a/misc/expansion_resetting.gif b/misc/expansion_resetting.gif
diff --git a/scripts/__pycache__/ideal_robot.cpython-37.pyc b/scripts/__pycache__/ideal_robot.cpython-37.pyc
diff --git a/scripts/__pycache__/puddle_world.cpython-37.pyc b/scripts/__pycache__/puddle_world.cpython-37.pyc
diff --git a/scripts/puddle_world.py b/scripts/puddle_world.py
@@ -131,7 +131,7 @@ def draw(self, ax, elems):
 
 def trial():  ###puddle_world4_trial
     time_interval = 0.1
-    world = World(30, time_interval, debug=False) 
+    world = PuddleWorld(30, time_interval, debug=False) 
 
     ## 地図を生成して3つランドマークを追加 ##
     m = Map()

diff --git a/section_advanced_localization/expansion_reset_mcl.ipynb b/section_advanced_localization/expansion_reset_mcl.ipynb
diff --git a/section_advanced_localization/expansion_sensor_reset_mcl.ipynb b/section_advanced_localization/expansion_sensor_reset_mcl.ipynb
diff --git a/section_fastslam/fastslam1.ipynb b/section_fastslam/fastslam1.ipynb
@@ -19,7 +19,7 @@
    "source": [
     "class FastSlam(Mcl):\n",
     "    def __init__(self, envmap, init_pose, particle_num, landmark_num, motion_noise_stds={\"nn\":0.19, \"no\":0.001, \"on\":0.13, \"oo\":0.2}, \\\n",
-    "                 distance_dev_rate=0.14, direction_dev=0.05): #envmapとlandmark_numを入れ替え\n",
+    "                 distance_dev_rate=0.14, direction_dev=0.05): #numをparticle_numにして、landmark_numを追加\n",
     "        super().__init__(envmap, init_pose, particle_num, motion_noise_stds, distance_dev_rate, direction_dev)"
    ]
   },
@@ -867,7 +867,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.0"
+   "version": "3.7.3"
   }
  },
  "nbformat": 4,

diff --git a/section_fastslam/tmp.ipynb b/section_fastslam/tmp.ipynb
diff --git a/section_graph_slam/graphbasedslam1.ipynb b/section_graph_slam/graphbasedslam1.ipynb
@@ -903,7 +903,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.0"
+   "version": "3.7.3"
   }
  },
  "nbformat": 4,

diff --git a/section_graph_slam/graphbasedslam3.ipynb b/section_graph_slam/graphbasedslam3.ipynb
@@ -100,7 +100,7 @@
     "        s2 = math.sin(self.x2[2] + self.z2[1])\n",
     "        c2 = math.cos(self.x2[2] + self.z2[1])\n",
     "        \n",
-    "        ##誤差の計算##\n",
+    "        ##残差の計算##\n",
     "        hat_e = self.x2 - self.x1 + np.array([\n",
     "            self.z2[0]*c2 - self.z1[0]*c1, \n",
     "            self.z2[0]*s2 - self.z1[0]*s1,\n",
@@ -1674,7 +1674,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.0"
+   "version": "3.7.3"
   }
  },
  "nbformat": 4,

diff --git a/section_graph_slam/graphbasedslam4.ipynb b/section_graph_slam/graphbasedslam4.ipynb
@@ -3094,7 +3094,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.0"
+   "version": "3.7.3"
   }
  },
  "nbformat": 4,

diff --git a/section_inference/gauss_gamma1.ipynb b/section_inference/gauss_gamma1.ipynb
diff --git a/section_inference/gauss_gamma2.ipynb b/section_inference/gauss_gamma2.ipynb
@@ -272,7 +272,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.0"
+   "version": "3.7.3"
   }
  },
  "nbformat": 4,