Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RL team finish #1

Open
wants to merge 71 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
0a737c7
made it a rospackage
Mar 9, 2017
32961a7
added folders
Mar 9, 2017
65f2eb7
added starting mask files
Mar 9, 2017
1b00878
inital file
Mar 9, 2017
6ca2104
Merge branch 'master' of github.com:kzhang8850/lane_follower
Mar 9, 2017
db42bf7
made color mask finder
Mar 9, 2017
94ce615
added comments to mask_finder
Mar 9, 2017
8481892
Merge branch 'master' of github.com:kzhang8850/lane_follower
Mar 9, 2017
c72c98c
added gitignore and some photos
Mar 9, 2017
afb037d
basic reward function working
Mar 9, 2017
69b1204
Merge branch 'master' of github.com:kzhang8850/lane_follower
Mar 9, 2017
13afea5
added image resizing file
Mar 20, 2017
d9a7b6e
masking red now
Mar 20, 2017
e9b18ee
Merge branch 'master' of github.com:kzhang8850/lane_follower
Mar 20, 2017
589813e
Merge branch 'master' of github.com:kzhang8850/lane_follower
Mar 20, 2017
6a14b31
made framework for rl in get_image - should rename file
Mar 22, 2017
70d18e2
merging versions
Mar 23, 2017
b6db1d7
added network class, TODO: convert self.actions to enum
Mar 23, 2017
9dca6ba
Merge branch 'master' of github.com:kzhang8850/lane_follower
Mar 23, 2017
5350218
progress back to robot control
Mar 23, 2017
771ab68
Merge branch 'master' of github.com:kzhang8850/lane_follower
Mar 23, 2017
41d06a5
working robot control - need to rename a lot of things
Mar 23, 2017
ef59225
e now updates, y added
Mar 23, 2017
49e301e
robot_control is main file
Mar 23, 2017
51a3945
Merge branch 'master' of github.com:kzhang8850/lane_follower
Mar 23, 2017
0a78c74
Merge branch 'master' of github.com:kzhang8850/lane_follower
Mar 23, 2017
97de08b
added stopState rather than stop
Mar 23, 2017
301400f
Merge branch 'master' of github.com:kzhang8850/lane_follower
Mar 23, 2017
64e65fd
fix spaces/tab issue
Mar 23, 2017
104d882
integrated scripts
Mar 23, 2017
649304d
merging versions
Mar 23, 2017
a5593a8
fix spaces/tab issue
Mar 23, 2017
4b26d00
first pass RL works somewhat
Mar 23, 2017
14b0e39
first pass tweak to reward function
Mar 23, 2017
6e505f5
added data collection file
Mar 24, 2017
4a40f05
fixed mirroring in conv_data
Mar 24, 2017
2dae7b2
made dataset
Mar 25, 2017
486a7ee
upgrade to convnet
Mar 25, 2017
f939463
IT WORKS OMG
Mar 26, 2017
2d733c7
tweaked parameters, added half a line to reward
Mar 27, 2017
a02532b
code overhaul/cleanup
Mar 30, 2017
a46441c
small change to Readme, deleted contribution lines
Mar 30, 2017
f796996
added project writeup.html
Apr 1, 2017
a5b6174
Update/Create 2017-04-01-Project-Writeup.md
Apr 2, 2017
389f792
Update/Create OsRMiLcfOSn13tNMyGPtw_img_0.jpg
Apr 2, 2017
da17751
Update/Create OsRMiLcfOSn13tNMyGPtw_img_1.png
Apr 2, 2017
b7f4432
Update/Create OsRMiLcfOSn13tNMyGPtw_img_2.png
Apr 2, 2017
7375334
Delete 2017-04-01-Project-Writeup.md
Apr 2, 2017
eb40fd7
Update/Create 2017-04-01-Project-Writeup.md
Apr 2, 2017
4d6467e
Update/Create OsRMiLcfOSn13tNMyGPtw_img_0.jpg
Apr 2, 2017
a2fb597
Update/Create OsRMiLcfOSn13tNMyGPtw_img_1.png
Apr 2, 2017
2adc724
Update/Create OsRMiLcfOSn13tNMyGPtw_img_2.png
Apr 2, 2017
ab8dbd3
Update 2017-04-01-Project-Writeup.md
Apr 2, 2017
cf59c9c
Update README.md
Apr 2, 2017
c2c3a5b
Update/Create 2017-04-01-Project-Writeup.md
Apr 2, 2017
72e4da5
Update/Create OsRMiLcfOSn13tNMyGPtw_img_0.jpg
Apr 2, 2017
69bb784
Update/Create OsRMiLcfOSn13tNMyGPtw_img_1.png
Apr 2, 2017
18f66aa
Update/Create OsRMiLcfOSn13tNMyGPtw_img_2.png
Apr 2, 2017
df45b65
removed html writeup and cropped images
Apr 2, 2017
14e0ad7
fixed images in markdown file
Apr 2, 2017
588984f
removed table from writeup
Apr 2, 2017
70c5b54
changed readme to the writeup
Apr 2, 2017
67f2ecf
fixed?
Apr 2, 2017
02448bb
actually fixed
Apr 2, 2017
22ec07a
removed old images
Apr 2, 2017
21cf6da
cropped images
Apr 2, 2017
f646b8e
resized resolution of images
Apr 2, 2017
7571879
testing png
Apr 2, 2017
0c66d5f
renamed images to crop them
Apr 2, 2017
18528cb
fixed image locations in readme
Apr 2, 2017
31c9fa3
Final
Apr 2, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
193 changes: 193 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,193 @@

# Created by https://www.gitignore.io/api/ros,python,c++,vim

### C++ ###
# Prerequisites
*.d

# Compiled Object files
*.slo
*.lo
*.o
*.obj

# Precompiled Headers
*.gch
*.pch

# Compiled Dynamic libraries
*.so
*.dylib
*.dll

# Fortran module files
*.mod
*.smod

# Compiled Static libraries
*.lai
*.la
*.a
*.lib

# Executables
*.exe
*.out
*.app

### Python ###
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions

# Distribution / packaging
.Python
env/
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
*.egg-info/
.installed.cfg
*.egg

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*,cover
.hypothesis/

# Translations
*.mo
*.pot

# Django stuff:
*.log
local_settings.py

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy

# Sphinx documentation
docs/_build/

# PyBuilder
target/

# Jupyter Notebook
.ipynb_checkpoints

# pyenv
.python-version

# celery beat schedule file
celerybeat-schedule

# dotenv
.env

# virtualenv
.venv
venv/
ENV/

# Spyder project settings
.spyderproject

# Rope project settings
.ropeproject

### ROS ###
bin/
msg_gen/
srv_gen/
msg/*Action.msg
msg/*ActionFeedback.msg
msg/*ActionGoal.msg
msg/*ActionResult.msg
msg/*Feedback.msg
msg/*Goal.msg
msg/*Result.msg
msg/_*.py

# Generated by dynamic reconfigure
*.cfgc
/cfg/cpp/
/cfg/*.py

# Ignore generated docs
*.dox
*.wikidoc

# eclipse stuff
.project
.cproject

# qcreator stuff
CMakeLists.txt.user

srv/_*.py
*.pcd
*.pyc
qtcreator-*
*.user

/planning/cfg
/planning/docs
/planning/src

# Data folder
/src/scripts/data

*~

# Emacs
.#*

# Catkin custom files
CATKIN_IGNORE

### Vim ###
# swap
[._]*.s[a-v][a-z]
[._]*.sw[a-p]
[._]s[a-v][a-z]
[._]sw[a-p]
# session
Session.vim
# temporary
.netrwhist
# auto-generated tag files
tags

# End of https://www.gitignore.io/api/ros,python,c++,vim
187 changes: 187 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,187 @@
cmake_minimum_required(VERSION 2.8.3)
project(lane_follower)

## Find catkin macros and libraries
## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)
## is used, also find other catkin packages
find_package(catkin REQUIRED COMPONENTS
roscpp
rospy
)

## System dependencies are found with CMake's conventions
# find_package(Boost REQUIRED COMPONENTS system)


## Uncomment this if the package has a setup.py. This macro ensures
## modules and global scripts declared therein get installed
## See http://ros.org/doc/api/catkin/html/user_guide/setup_dot_py.html
# catkin_python_setup()

################################################
## Declare ROS messages, services and actions ##
################################################

## To declare and build messages, services or actions from within this
## package, follow these steps:
## * Let MSG_DEP_SET be the set of packages whose message types you use in
## your messages/services/actions (e.g. std_msgs, actionlib_msgs, ...).
## * In the file package.xml:
## * add a build_depend tag for "message_generation"
## * add a build_depend and a run_depend tag for each package in MSG_DEP_SET
## * If MSG_DEP_SET isn't empty the following dependency has been pulled in
## but can be declared for certainty nonetheless:
## * add a run_depend tag for "message_runtime"
## * In this file (CMakeLists.txt):
## * add "message_generation" and every package in MSG_DEP_SET to
## find_package(catkin REQUIRED COMPONENTS ...)
## * add "message_runtime" and every package in MSG_DEP_SET to
## catkin_package(CATKIN_DEPENDS ...)
## * uncomment the add_*_files sections below as needed
## and list every .msg/.srv/.action file to be processed
## * uncomment the generate_messages entry below
## * add every package in MSG_DEP_SET to generate_messages(DEPENDENCIES ...)

## Generate messages in the 'msg' folder
# add_message_files(
# FILES
# Message1.msg
# Message2.msg
# )

## Generate services in the 'srv' folder
# add_service_files(
# FILES
# Service1.srv
# Service2.srv
# )

## Generate actions in the 'action' folder
# add_action_files(
# FILES
# Action1.action
# Action2.action
# )

## Generate added messages and services with any dependencies listed here
# generate_messages(
# DEPENDENCIES
# std_msgs # Or other packages containing msgs
# )

################################################
## Declare ROS dynamic reconfigure parameters ##
################################################

## To declare and build dynamic reconfigure parameters within this
## package, follow these steps:
## * In the file package.xml:
## * add a build_depend and a run_depend tag for "dynamic_reconfigure"
## * In this file (CMakeLists.txt):
## * add "dynamic_reconfigure" to
## find_package(catkin REQUIRED COMPONENTS ...)
## * uncomment the "generate_dynamic_reconfigure_options" section below
## and list every .cfg file to be processed

## Generate dynamic reconfigure parameters in the 'cfg' folder
# generate_dynamic_reconfigure_options(
# cfg/DynReconf1.cfg
# cfg/DynReconf2.cfg
# )

###################################
## catkin specific configuration ##
###################################
## The catkin_package macro generates cmake config files for your package
## Declare things to be passed to dependent projects
## INCLUDE_DIRS: uncomment this if you package contains header files
## LIBRARIES: libraries you create in this project that dependent projects also need
## CATKIN_DEPENDS: catkin_packages dependent projects also need
## DEPENDS: system dependencies of this project that dependent projects also need
catkin_package(
# INCLUDE_DIRS include
# LIBRARIES lane_follower
# CATKIN_DEPENDS roscpp rospy
# DEPENDS system_lib
)

###########
## Build ##
###########

## Specify additional locations of header files
## Your package locations should be listed before other locations
# include_directories(include)
include_directories(
${catkin_INCLUDE_DIRS}
)

## Declare a C++ library
# add_library(lane_follower
# src/${PROJECT_NAME}/lane_follower.cpp
# )

## Add cmake target dependencies of the library
## as an example, code may need to be generated before libraries
## either from message generation or dynamic reconfigure
# add_dependencies(lane_follower ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})

## Declare a C++ executable
# add_executable(lane_follower_node src/lane_follower_node.cpp)

## Add cmake target dependencies of the executable
## same as for the library above
# add_dependencies(lane_follower_node ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})

## Specify libraries to link a library or executable target against
# target_link_libraries(lane_follower_node
# ${catkin_LIBRARIES}
# )

#############
## Install ##
#############

# all install targets should use catkin DESTINATION variables
# See http://ros.org/doc/api/catkin/html/adv_user_guide/variables.html

## Mark executable scripts (Python etc.) for installation
## in contrast to setup.py, you can choose the destination
# install(PROGRAMS
# scripts/my_python_script
# DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
# )

## Mark executables and/or libraries for installation
# install(TARGETS lane_follower lane_follower_node
# ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
# LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
# RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
# )

## Mark cpp header files for installation
# install(DIRECTORY include/${PROJECT_NAME}/
# DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
# FILES_MATCHING PATTERN "*.h"
# PATTERN ".svn" EXCLUDE
# )

## Mark other files for installation (e.g. launch and bag files, etc.)
# install(FILES
# # myfile1
# # myfile2
# DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
# )

#############
## Testing ##
#############

## Add gtest based cpp test target and link libraries
# catkin_add_gtest(${PROJECT_NAME}-test test/test_lane_follower.cpp)
# if(TARGET ${PROJECT_NAME}-test)
# target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME})
# endif()

## Add folders to be run by python nosetests
# catkin_add_nosetests(test)
Loading