updated readme

README.md

@@ -29,7 +29,7 @@
 <br />
 <div align="center">
   <a href="https://github.com/Sentientplatypus/jackal">
-    <img src="images/logo.png" alt="Logo" width="80" height="80">
+    <img src="logo.png" alt="Logo" width="80" height="80">
   </a>
 
 <h3 align="center">Jackal</h3>
@@ -83,7 +83,7 @@
 
 [![Product Name Screen Shot][product-screenshot]](https://example.com)
 
-Here's a blank template to get started: To avoid retyping too much info. Do a search and replace with your text editor for the following: `Sentientplatypus`, `jackal`, `twitter_handle`, `linkedin_username`, `yahoo.com`, `geneustacewicaksono`, `jackal`, `In the autonomous systems lab, our goal is to develop a robot that helps evacuate people out of buildings. our robot, named jackal has been used in pilot studies studying human-robot interaction when there are contradicting values. For example, in an emergency, people will often search for their valuables before exiting the building, thus decreasing their chances of survival. The robot on the other hand, will want to exit the building. We are studying the best robot behaviors to get the people to follow it faster. `
+Things
 
 <p align="right">(<a href="#readme-top">back to top</a>)</p>
 
@@ -100,8 +100,13 @@ Here's a blank template to get started: To avoid retyping too much info. Do a se
 <!-- GETTING STARTED -->
 ## Getting Started
 
-This is an example of how you may give instructions on setting up your project locally.
-To get a local copy up and running follow these simple example steps.
+I worked bloating the walls. This step ensures that the robot does not run into walls. I do this by taking the walls and sort of "bloating" them and telling the robot those bloated walls are the real walls. Additionally, I worked on creating a ROS node for projecting a human position onto the a predetermined roadmap so the robot can go to it.
+
+This is bloating:
+![Bloating](bloating_walls/Figure_1.png)
+
+This is projecting a human onto the roadmap:
+![projecting](human_roadmap/Figure_1.png)
 
 ### Prerequisites
 
@@ -113,8 +118,8 @@ This is an example of how to list things you need to use the software and how to
 
 ### Installation
 
-1. Get a free API Key at [https://example.com](https://example.com)
-2. Clone the repo
+
+1. Clone the repo
    ```sh
    git clone https://github.com/Sentientplatypus/jackal.git
    ```
@@ -213,21 +218,5 @@ Project Link: [https://github.com/Sentientplatypus/jackal](https://github.com/Se
 [linkedin-shield]: https://img.shields.io/badge/-LinkedIn-black.svg?style=for-the-badge&logo=linkedin&colorB=555
 [linkedin-url]: https://linkedin.com/in/linkedin_username
 [product-screenshot]: images/screenshot.png
-[Next.js]: https://img.shields.io/badge/next.js-000000?style=for-the-badge&logo=nextdotjs&logoColor=white
-[Next-url]: https://nextjs.org/
-[React.js]: https://img.shields.io/badge/React-20232A?style=for-the-badge&logo=react&logoColor=61DAFB
-[React-url]: https://reactjs.org/
-[Vue.js]: https://img.shields.io/badge/Vue.js-35495E?style=for-the-badge&logo=vuedotjs&logoColor=4FC08D
-[Vue-url]: https://vuejs.org/
-[Angular.io]: https://img.shields.io/badge/Angular-DD0031?style=for-the-badge&logo=angular&logoColor=white
-[Angular-url]: https://angular.io/
-[Svelte.dev]: https://img.shields.io/badge/Svelte-4A4A55?style=for-the-badge&logo=svelte&logoColor=FF3E00
-[Svelte-url]: https://svelte.dev/
-[Laravel.com]: https://img.shields.io/badge/Laravel-FF2D20?style=for-the-badge&logo=laravel&logoColor=white
-[Laravel-url]: https://laravel.com
-[Bootstrap.com]: https://img.shields.io/badge/Bootstrap-563D7C?style=for-the-badge&logo=bootstrap&logoColor=white
-[Bootstrap-url]: https://getbootstrap.com
-[JQuery.com]: https://img.shields.io/badge/jQuery-0769AD?style=for-the-badge&logo=jquery&logoColor=white
-[JQuery-url]: https://jquery.com 
 [python]: https://img.shields.io/badge/Python-3776AB?style=for-the-badge&logo=python&logoColor=white
 [python-url]: https://python.com

bloating_walls/wallbloat.py

@@ -124,4 +124,10 @@ def walls_to_file(bloated, filename):
         for wall in bloated:
             x1, y1 = wall[0]
             x2, y2 = wall[1]
-            file.write(f"{x1} {y1} {x2} {y2}\n")
+            file.write(f"{x1} {y1} {x2} {y2}\n")
+
+
+if __name__ == "__main__":
+    rhodes = walls_from_file("bloating_walls\walls.txt")
+    plot_walls(rhodes, bloat(rhodes, 0.5))
+    walls_to_file(bloat(rhodes, 0.5), "bloating_walls\bloated.txt")

human_roadmap/roadmap.py

@@ -115,6 +115,6 @@ def plot(self, human = None):
 if __name__ == "__main__":
     print("we out")
     rm = RoadMap(r"W:\Code\workorinternship\jackal\human_roadmap\rhd3_map_3_walls.txt", r"W:\Code\workorinternship\jackal\human_roadmap\rhd3_map_3_waypoints.txt")
-    human = np.array([0, 0])
+    human = np.array([10, -9])
     # rm.project(human)
     rm.plot(human= human)