From d2991efbd5278c36a53cf691e4c516a8bf52cd27 Mon Sep 17 00:00:00 2001 From: Lrac Date: Sun, 19 Oct 2014 16:23:52 -0400 Subject: [PATCH 1/4] I contributed --- main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.cpp b/main.cpp index 266995c..abd8c72 100644 --- a/main.cpp +++ b/main.cpp @@ -1,7 +1,7 @@ /* Dynamic Artificial Neural Network Created by Jonathon Wong - Contributors: Rose Li, Adam Suban-Loewen, Andrew Pelegris, Michael Chiou + Contributors: Rose Li, Adam Suban-Loewen, Andrew Pelegris, Michael Chiou, Carl Lam Date: 2013 */ From 5bfb4986ede21f9005fb067c1324416214f6d7fc Mon Sep 17 00:00:00 2001 From: Lrac Date: Sun, 19 Oct 2014 16:32:56 -0400 Subject: [PATCH 2/4] main.cpp-woops, forgot something --- main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.cpp b/main.cpp index abd8c72..500ed31 100644 --- a/main.cpp +++ b/main.cpp @@ -1,7 +1,7 @@ /* Dynamic Artificial Neural Network Created by Jonathon Wong - Contributors: Rose Li, Adam Suban-Loewen, Andrew Pelegris, Michael Chiou, Carl Lam + Contributors: Rose Li, Adam Suban-Loewen, Andrew Pelegris, Michael Chiou, Carl Lam (take2) Date: 2013 */ From 6073f5a3c8616ffc23fb819e4ac86bf6de668845 Mon Sep 17 00:00:00 2001 From: Lrac Date: Sun, 19 Oct 2014 16:51:53 -0400 Subject: [PATCH 3/4] Carl-First commit --- Carl.cpp | 15 +++++++++++++++ Carl.h | 19 +++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 Carl.cpp create mode 100644 Carl.h diff --git a/Carl.cpp b/Carl.cpp new file mode 100644 index 0000000..ef3cc04 --- /dev/null +++ b/Carl.cpp @@ -0,0 +1,15 @@ +#include "Carl.h" +#include + + +Carl::Carl() { + favoriteFood = "pizza"; +}; + +string Carl::getFavoriteFood() { + return favoriteFood; +} + +Carl::setFavoriteFood(string newFavoriteFood) { + cout <<"Error: Can't change favorite food. Pizza's still the best." << endl; +} diff --git a/Carl.h b/Carl.h new file mode 100644 index 0000000..9a79356 --- /dev/null +++ b/Carl.h @@ -0,0 +1,19 @@ +#ifndef CARL_H +#define CARL_H + +#include + +using namespace std; + +class Carl { + private: + string favoriteFood; + + public: + + string getFavoriteFood(); + setFavoriteFood(string newFavoriteFood); + +}; + +#endif From 3f49270600266882fe000c091de2727e2f2ec247 Mon Sep 17 00:00:00 2001 From: Lrac Date: Sun, 19 Oct 2014 16:58:14 -0400 Subject: [PATCH 4/4] forgot the constructor :P --- Carl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Carl.h b/Carl.h index 9a79356..c4c7cad 100644 --- a/Carl.h +++ b/Carl.h @@ -8,9 +8,9 @@ using namespace std; class Carl { private: string favoriteFood; - + public: - + Carl(); string getFavoriteFood(); setFavoriteFood(string newFavoriteFood);