From 6e012810cd4ed2f519e129156ecedff616126ffc Mon Sep 17 00:00:00 2001 From: Kamadje Allen <46921711+allenbangai@users.noreply.github.com> Date: Wed, 30 Oct 2019 22:11:43 +0100 Subject: [PATCH 1/6] Update README.md --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5f6e3a3..d18f5a5 100644 --- a/README.md +++ b/README.md @@ -18,4 +18,6 @@ Students are expected to setup the following. * Move to your working directory, that is `cd yourDirectoryName/JavaLearningCode` * Creat a new branch with `git checkout -b YourBranchName` * On pushing your work make sure you push but the branch for example `git push YourBranchName` - * Once you have push, go online and create PR so that your work will be reviewed and merged. \ No newline at end of file + * Once you have push, come to us and we shall create in branch in your name where you shall be creating all your PR to. + * Go online and create PR to the branch with your name so that your work will be reviewed and merged. + * Thanks From 4ccad0ab3eb0ea852d1b00b31d30d47d03bdef9a Mon Sep 17 00:00:00 2001 From: =allenbangai <=allenkamadje@gmail.com> Date: Wed, 30 Oct 2019 22:24:19 +0100 Subject: [PATCH 2/6] Deleting brice folder from master branch --- .../bryzz/dsc/Chapter_2/Arithmetic2-15.java | 42 ----------- .../bryzz/dsc/Chapter_2/DisplayNumbers.java | 32 --------- .../com/bryzz/dsc/Chapter_2/HelloWorld.java | 8 --- .../com/bryzz/dsc/Chapter_2/arithmetic3.java | 67 ------------------ .../bryzz/dsc/Chapter_2/comparingNumbers.java | 23 ------ .../bryzz/dsc/CompareNumbers/.attach_pid18990 | 0 .../META-INF/CompareNumbers.kotlin_module | Bin 16 -> 0 bytes .../bryzz/dsc/numbers/comparingNumbers.java | 23 ------ 8 files changed, 195 deletions(-) delete mode 100644 resources/Brice/Chapter_2/src/com/bryzz/dsc/Chapter_2/Arithmetic2-15.java delete mode 100644 resources/Brice/Chapter_2/src/com/bryzz/dsc/Chapter_2/DisplayNumbers.java delete mode 100644 resources/Brice/Chapter_2/src/com/bryzz/dsc/Chapter_2/HelloWorld.java delete mode 100644 resources/Brice/Chapter_2/src/com/bryzz/dsc/Chapter_2/arithmetic3.java delete mode 100644 resources/Brice/Chapter_2/src/com/bryzz/dsc/Chapter_2/comparingNumbers.java delete mode 100644 resources/Brice/Chapter_2/src/com/bryzz/dsc/CompareNumbers/.attach_pid18990 delete mode 100644 resources/Brice/Chapter_2/src/com/bryzz/dsc/CompareNumbers/out/production/CompareNumbers/META-INF/CompareNumbers.kotlin_module delete mode 100644 resources/Brice/Chapter_2/src/com/bryzz/dsc/CompareNumbers/src/com/bryzz/dsc/numbers/comparingNumbers.java diff --git a/resources/Brice/Chapter_2/src/com/bryzz/dsc/Chapter_2/Arithmetic2-15.java b/resources/Brice/Chapter_2/src/com/bryzz/dsc/Chapter_2/Arithmetic2-15.java deleted file mode 100644 index 67d73ee..0000000 --- a/resources/Brice/Chapter_2/src/com/bryzz/dsc/Chapter_2/Arithmetic2-15.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.bryzz.dsc.arithmetic2; - -import java.util.Scanner; -import java.math.*; - -class Arithmetic2 { - - private static Scanner scanner = new Scanner(System.in); - public static void main(String[] args) { - System.out.println("Enter two numbers: "); - int x = scanner.nextInt(); - int y = scanner.nextInt(); - - int sum = x + y; - int dif = x - y; - if(dif<0) { - dif = y - x; - } - int pxt = x*y; - int div = x/y; - if(x == 0 ) { - div = 0; - } - if(y == 0 ) { - div = 0; - } - if(div < 1 ) { - div = y/x; - } - - System.out.printf("\n\nSum = %d\nDifference = %d\nProduct = %d\nQuotient = %d", sum, dif, pxt, div); - - - } -} - -/* -(Arithmetic) Write an application that asks the user to enter two integers, obtains them - from the user and prints their sum, product, difference and quotient (division). - - Note that you should request a PR to this repo an your code will be merge in a branch with your name. - Also, the name of your file should be arithmetic2-15.java*/ \ No newline at end of file diff --git a/resources/Brice/Chapter_2/src/com/bryzz/dsc/Chapter_2/DisplayNumbers.java b/resources/Brice/Chapter_2/src/com/bryzz/dsc/Chapter_2/DisplayNumbers.java deleted file mode 100644 index 64d56eb..0000000 --- a/resources/Brice/Chapter_2/src/com/bryzz/dsc/Chapter_2/DisplayNumbers.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.bryzz.dsc; - -public class DisplayNumbers { - - public static void main(String[] args) { - System.out.println("\n1 - 4 using one System.out.println()"); - onePrintln(); - - System.out.println("\n\n1 - 4 using four System.out.print()"); - fourPrintln(); - - System.out.println("\n\n1 - 4 using four System.out.printf()"); - printf(); - } - - public static void onePrintln() { - System.out.println("1 2 3 4"); - } - - public static void fourPrintln() { - int i = 1; - for(i=1; i<=4; i++) { - System.out.print(i + " "); - } - - } - - public static void printf() { - System.out.printf("%d %d %d %d",1, 2, 3, 4); - } -} - diff --git a/resources/Brice/Chapter_2/src/com/bryzz/dsc/Chapter_2/HelloWorld.java b/resources/Brice/Chapter_2/src/com/bryzz/dsc/Chapter_2/HelloWorld.java deleted file mode 100644 index 651246c..0000000 --- a/resources/Brice/Chapter_2/src/com/bryzz/dsc/Chapter_2/HelloWorld.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.bryzz.dsc.hello; - -public class HelloWorld { - - public static void main(String[] args) { - System.out.println("Hello World!!!"); - } -} diff --git a/resources/Brice/Chapter_2/src/com/bryzz/dsc/Chapter_2/arithmetic3.java b/resources/Brice/Chapter_2/src/com/bryzz/dsc/Chapter_2/arithmetic3.java deleted file mode 100644 index f264908..0000000 --- a/resources/Brice/Chapter_2/src/com/bryzz/dsc/Chapter_2/arithmetic3.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.bryzz.dsc.arithmetic3; - - -import java.util.Scanner; -import java.math.*; - -class Main { - - private static Scanner scanner = new Scanner(System.in); - public static void main(String[] args) { - System.out.println("Enter 10 numbers: "); - int[] list = new int[10]; - int sum = 0; - int pxt = 1; - int average = 0; - int smallest = 0, largest = 0; - - - for(int i=0; i largest) { - largest = num; - } - - if(num < smallest) { - smallest = num; - } - - } - - - average = sum/list.length; - - - System.out.printf("\n\nSum = %d\nAverage = %d\nProduct = %d\nSmallest = %d\nLargest = %d", sum, average, pxt, smallest, largest); - - - } - - -} - -/* - -Write an application that inputs a given amount of integers from the user and -displays the sum, average, product, smallest and largest of the numbers. -[Note: The calculation of the average in this exercise should result in an integer representation of the average. -So, if the sum of the values of 3 integers is 7, the average should be 2, not 2.3333….]. - -The name of your program file should be arithmethic3.java - - -*/ diff --git a/resources/Brice/Chapter_2/src/com/bryzz/dsc/Chapter_2/comparingNumbers.java b/resources/Brice/Chapter_2/src/com/bryzz/dsc/Chapter_2/comparingNumbers.java deleted file mode 100644 index f7da2be..0000000 --- a/resources/Brice/Chapter_2/src/com/bryzz/dsc/Chapter_2/comparingNumbers.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.bryzz.dsc.numbers; - -import java.util.Scanner; - - -class Main { - - private static Scanner scanner = new Scanner(System.in); - public static void main(String[] args) { - - System.out.println("Enter two numbers:\n"); - double x = scanner.nextDouble(); - double y = scanner.nextDouble(); - if(x > y) { - System.out.println(x + " Larger"); - }else if(y > x) { - System.out.println(y + " Larger"); - }else { - System.out.println("These numbers are equal"); - } - - } -} diff --git a/resources/Brice/Chapter_2/src/com/bryzz/dsc/CompareNumbers/.attach_pid18990 b/resources/Brice/Chapter_2/src/com/bryzz/dsc/CompareNumbers/.attach_pid18990 deleted file mode 100644 index e69de29..0000000 diff --git a/resources/Brice/Chapter_2/src/com/bryzz/dsc/CompareNumbers/out/production/CompareNumbers/META-INF/CompareNumbers.kotlin_module b/resources/Brice/Chapter_2/src/com/bryzz/dsc/CompareNumbers/out/production/CompareNumbers/META-INF/CompareNumbers.kotlin_module deleted file mode 100644 index 2983af70661ad375cc499ebc4da5a68ca46c532e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16 RcmZQzU|?ooU|@t|egFVe02KfL diff --git a/resources/Brice/Chapter_2/src/com/bryzz/dsc/CompareNumbers/src/com/bryzz/dsc/numbers/comparingNumbers.java b/resources/Brice/Chapter_2/src/com/bryzz/dsc/CompareNumbers/src/com/bryzz/dsc/numbers/comparingNumbers.java deleted file mode 100644 index f7da2be..0000000 --- a/resources/Brice/Chapter_2/src/com/bryzz/dsc/CompareNumbers/src/com/bryzz/dsc/numbers/comparingNumbers.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.bryzz.dsc.numbers; - -import java.util.Scanner; - - -class Main { - - private static Scanner scanner = new Scanner(System.in); - public static void main(String[] args) { - - System.out.println("Enter two numbers:\n"); - double x = scanner.nextDouble(); - double y = scanner.nextDouble(); - if(x > y) { - System.out.println(x + " Larger"); - }else if(y > x) { - System.out.println(y + " Larger"); - }else { - System.out.println("These numbers are equal"); - } - - } -} From 2a071655808073f8ee19b3bad5e2d7ed1a5f5c51 Mon Sep 17 00:00:00 2001 From: Kamadje Allen <46921711+allenbangai@users.noreply.github.com> Date: Wed, 30 Oct 2019 22:46:43 +0100 Subject: [PATCH 3/6] Update README.md --- README.md | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d18f5a5..2b5e372 100644 --- a/README.md +++ b/README.md @@ -13,11 +13,21 @@ Students are expected to setup the following. ## Steps to follow when working. - After cloning the repository, Creat a new directory and give it your `Name` For example: `CollinsJava` -- Creat a new branch with you name, follow this steps - * Open a new terminal windows +- Creat a new branch with you name, follow this steps. + * Open a new terminal windows. * Move to your working directory, that is `cd yourDirectoryName/JavaLearningCode` * Creat a new branch with `git checkout -b YourBranchName` * On pushing your work make sure you push but the branch for example `git push YourBranchName` * Once you have push, come to us and we shall create in branch in your name where you shall be creating all your PR to. * Go online and create PR to the branch with your name so that your work will be reviewed and merged. * Thanks + +## How to go through your work +- There are level of difficulties to go through and each person should solve atmost 8 and atleast 6 of each difficulty before going to the next level of difficulty. The levels are: + * Difficulty01 + * Difficulty02 + * Difficulty03 + * Difficulty04 + * Difficulty05 +- It should be advisable that each level of difficulty issues should be in a different folder. +- Going though all this will help you being suited to android development using the java language. From e95994cfae23d89dfebfb69741935caa3be8001b Mon Sep 17 00:00:00 2001 From: Kamadje Allen <46921711+allenbangai@users.noreply.github.com> Date: Thu, 31 Oct 2019 06:29:59 +0100 Subject: [PATCH 4/6] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 2b5e372..86fb41e 100644 --- a/README.md +++ b/README.md @@ -30,4 +30,6 @@ Students are expected to setup the following. * Difficulty04 * Difficulty05 - It should be advisable that each level of difficulty issues should be in a different folder. +- Depending on your skills, you can start from any level of diffiulty and go though the issues. +- If you think you are skill enough, you can make your first PR to this android project https://github.com/DSC-UB/travel_mobile. - Going though all this will help you being suited to android development using the java language. From 09b739c08cbe80fd98f79e7dc203d784fcc9254c Mon Sep 17 00:00:00 2001 From: Kamadje Allen <46921711+allenbangai@users.noreply.github.com> Date: Thu, 31 Oct 2019 20:21:46 +0100 Subject: [PATCH 5/6] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 86fb41e..6f7c620 100644 --- a/README.md +++ b/README.md @@ -31,5 +31,5 @@ Students are expected to setup the following. * Difficulty05 - It should be advisable that each level of difficulty issues should be in a different folder. - Depending on your skills, you can start from any level of diffiulty and go though the issues. -- If you think you are skill enough, you can make your first PR to this android project https://github.com/DSC-UB/travel_mobile. +- If you think you are skill enough not to go through our issues, you can make your first PR to this android project https://github.com/DSC-UB/travel_mobile. - Going though all this will help you being suited to android development using the java language. From 51b8a78744dc6f3a1f997f0a3a4ae7e9aee41d82 Mon Sep 17 00:00:00 2001 From: Kamadje Allen <46921711+allenbangai@users.noreply.github.com> Date: Sat, 23 Nov 2019 06:54:27 +0100 Subject: [PATCH 6/6] Update README.md --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 6f7c620..c1eb057 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,9 @@ Students are expected to setup the following. - Download and install jdk 11 or 12. Use this link https://www.oracle.com/technetwork/java/javase/downloads/jdk12-downloads-5295953.html or this https://www.oracle.com/technetwork/java/javase/downloads/jdk11-downloads-5066655.html . - Apply for github student pack here https://education.github.com/discount_requests/new . -- Come back to us in the WhatsApp group so we may help you make your first PR with a simple "hello world" program. +- Come back to us in the WhatsApp group so we may help you make your first PR with a simple "hello world" program + follow this video course to know how to walk though git and github. +. ## Steps to follow when working. - After cloning the repository, Creat a new directory and give it your `Name` For example: `CollinsJava`