diff --git a/.gitignore b/.gitignore
index d838d2aac5da54d9395bfa1ea7427a13b447d92d..8b048574637e339c1852e279770b3791ebd3fb33 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,5 @@
*.aux
*.bbl
*.blg
-*DS_STORE*
+*DS_Store*
+*.csv
diff --git a/Proposals/Chris/Proposal.pdf b/Proposals/Chris/Proposal.pdf
index e9760787efd38c2ab30c353671cacf1a425a9e71..b8878d45a6516963a05ccb4951ef8b6e5a63e4c7 100644
Binary files a/Proposals/Chris/Proposal.pdf and b/Proposals/Chris/Proposal.pdf differ
diff --git a/Proposals/Chris/Proposal.tex b/Proposals/Chris/Proposal.tex
index d0f1396f2d0b6b6f4eccc7331ac4b6cbd55d01d0..323d018e42e1573fb033af7bf7f5f6210415c580 100644
--- a/Proposals/Chris/Proposal.tex
+++ b/Proposals/Chris/Proposal.tex
@@ -23,7 +23,7 @@
\begin{document}
\title{TrawlExpert: Tool for Watershed Biological Research}
-\author{Lab section: L01 \\ Christopher W. Schankula \\Student ID: 400026650 \\schankuc@mcmaster.ca}
+\author{Trawlstars Inc. (Group 11) \\ Lab section: L01 \\ Christopher W. Schankula, 400026650, schankuc \\ Haley Glavina, 001412343, glavinhc \\ Winnie Liang, 400074498, liangw15 \\ Ray Liu, 400055250, liuc40 \\ Lawrence Chung, 400014482, chungl1}
\maketitle
\noindent\textit{By virtue of submitting this document I electronically sign and date that the work being submitted is my own individual work.}
@@ -113,8 +113,10 @@ c) & d) \\
\clearpage
\section{Project Plan}
+\subsection{Milestones}
The following milestones will help inform our progress towards completing the goals. Given that the team contains 5 people, the team will be divided up into two subteams of 2-3 people for maximum efficiency. Individual members' tasks can be decided by the subteams based on the progress of that team towards completing the next milestone's goal(s). Subteams should be in constant communication and in agreement about the inputs and outputs of modules to avoid the need rewriting of code.
+
\begin{table}[h]
\centering
\begin{tabular}{p{0.16\hsize}p{0.38\hsize}p{0.38\hsize}}
@@ -146,6 +148,35 @@ The following milestones will help inform our progress towards completing the go
\noindent While this schedule provides a good reference and a way to monitor progress, team members should be flexible and remain in communication to ensure the project is kept on schedule. For example, if a milestone is reached before its given date, the next milestone should start development early. Approximately 1-2 weeks have been purposely left as padding at the end in case of unforeseen circumstances.
+
+\subsection{Team Roles}
+\begin{table}[h]
+ \centering
+ \begin{tabular}{p{0.20\hsize}p{0.30\hsize}p{0.10\hsize}}
+ \toprule
+ \textbf{Member} & \textbf{Role} & \textbf{Subteam}\\
+ \midrule
+ Christoper Schankula & Team Lead & A\\
+ \midrule
+ Ray Liu & TA \& Professor Liaison & A\\
+ \midrule
+ Winning Liang & Project Log Admin & A\\
+ \midrule
+ Haley Glavina & Meeting Minutes Admin & B\\
+ \midrule
+ Lawrence Chung & Head of Booking & B\\
+ \bottomrule
+ \end{tabular}
+\end{table}
+
+\subsection{Workflow}
+
+The team will use \textbf{GitLab} as the primary way of sharing code and keeping up to date. The Git repository will be split into two branches, in addition to the \textit{master} branch: \textit{TeamA} and \textit{TeamB}. Each Subteam will develop on their respective branch, then issue merge requests so the team can evaluate and approve merges into the \textit{master} branch.
+
+\subsection{Communication}
+
+The team will use \textbf{Slack} and \textbf{Facebook Messenger} as primary and secondary means of communication. A Slack group has been created and each of the members were invited to it. \textbf{Google Drive} will be used to keep track of documentation such as the \textit{Project Log} and meeting minutes.
+
\clearpage
\bibliographystyle{apa}
\bibliography{bib}
diff --git a/README.md b/README.md
index 460b8b6268f9bc1b8ac06e30ae046186abfd59e1..3b5f952935de037ff758abb48c41c1ce25dd057a 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# 2XB3 Group 11 [Def. need a better name!] Repository
+# 2XB3 Group 11 - Trawl Expert - Repository
This is our repository for everything relating to our project for 2XB3.
# Opening this project in Eclipse
@@ -25,4 +25,7 @@ files are generated automatically by Eclipse when you run your code; they're
ananlogous to *.o files we dealt with in C last semester. Therefore, it is
pointless and a pain to include them in the repository. So you don't need to
try to `git add` these files and don't worry that they're not showing up on the
-repository online.
\ No newline at end of file
+repository online.
+
+# Link for Google Drive meeting minutes
+* https://drive.google.com/drive/folders/1mKG5EY-oi8i9HsSlXeakLXsSqUTnXHjQ?usp=sharing
\ No newline at end of file
diff --git a/src/HelloWorld.java b/src/HelloWorld.java
index 47b13af2ed6a735d68ead52f3f1704334b497235..1635d44c9ce00ec6843148e3c9730e8f59709c3f 100644
--- a/src/HelloWorld.java
+++ b/src/HelloWorld.java
@@ -1,6 +1,6 @@
public class HelloWorld {
public static void main(String[] args) {
- System.out.println("Goodbye Team B!");
+ System.out.println("I really want a monkey!");
}
}
diff --git a/src/sandbox/BinaryIntExpression.java b/src/sandbox/BinaryIntExpression.java
new file mode 100644
index 0000000000000000000000000000000000000000..720de7803df38b6a1d55449ef6248efb34c871d1
--- /dev/null
+++ b/src/sandbox/BinaryIntExpression.java
@@ -0,0 +1,5 @@
+package sandbox;
+
+public interface BinaryIntExpression{
+ public int eval(int a1, int a2);
+}
\ No newline at end of file
diff --git a/src/sandbox/TestLambdas.java b/src/sandbox/TestLambdas.java
new file mode 100644
index 0000000000000000000000000000000000000000..69ac2bc4ac76ff8d89bbf350715f975842e96eef
--- /dev/null
+++ b/src/sandbox/TestLambdas.java
@@ -0,0 +1,64 @@
+/*
+ * More info on lambdas: http://tutorials.jenkov.com/java/lambda-expressions.html
+ */
+
+package sandbox;
+
+public class TestLambdas {
+ public static void main(String[] args) {
+ //declare the instances of BinaryIntExpression
+ BinaryIntExpression b0;
+ BinaryIntExpression b1;
+ BinaryIntExpression b2;
+ BinaryIntExpression b3;
+ BinaryIntExpression b4;
+ BinaryIntExpression b5;
+ BinaryIntExpression b6;
+ int result;
+
+ //specify the instances of the functions (these implicitly become the "eval()" function)
+ //single-line examples:
+ b0 = (a1, a2) -> a1 + a2;
+ b1 = (a1, a2) -> a1 - a2;
+ b2 = (a1, a2) -> a1 * a2;
+ b3 = (a1, a2) -> a1 / a2;
+ b4 = (a1, a2) -> 12 * 2 + 46;
+ //multi-line examples
+ b5 = (a1, a2) -> {
+ return a1 + a2;
+ };
+ b6 = (a1, a2) -> {
+ int n = a1 * a2;
+ n = n * a1 + 2 * a2;
+ return n;
+ };
+
+ //call the main function using the instances as a parameter.
+ result = binaryOperation(1,2,b0);
+ System.out.println(result);
+
+ result = binaryOperation(1,2,b1);
+ System.out.println(result);
+
+ result = binaryOperation(1,2,b2);
+ System.out.println(result);
+
+ result = binaryOperation(1,2,b3);
+ System.out.println(result);
+
+ result = binaryOperation(1,2,b4);
+ System.out.println(result);
+
+ result = binaryOperation(1,2,b5);
+ System.out.println(result);
+
+ result = binaryOperation(1,2,b6);
+ System.out.println(result);
+ }
+
+ public static int binaryOperation(int a1, int a2, BinaryIntExpression exp) {
+ //call the eval() function in the given BinaryIntExpression.
+ return exp.eval(a1, a2);
+ }
+
+}