From d03a467e8230ea1acb585ca43845ac6a19e74dee Mon Sep 17 00:00:00 2001 From: Zainab Hammami Date: Thu, 20 Apr 2017 18:16:49 +0300 Subject: [PATCH 1/6] is-prime --- IsPrime/is_prime.php | 40 +++++++++++++++++++++++++++++++++------- 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/IsPrime/is_prime.php b/IsPrime/is_prime.php index 9b98bff..b0f4f7e 100644 --- a/IsPrime/is_prime.php +++ b/IsPrime/is_prime.php @@ -1,13 +1,39 @@ - -/* + + + + + php-toy-problem + + - function is_prime($n){ - // code goes here + "; + } + for ($i = 2; $i <$n ; $i++) { + if ($n % $i === 0) { + echo "Number $n is not Prime
"; + } + elseif (!$n % $i === 0) { + echo "Number $n is Prime
"; + } + } + } + is_prime(1); + is_prime(3); + is_prime(5); + is_prime(6); + is_prime(7); + is_prime(8); + is_prime(9); + is_prime(10); + ?> + + - } From 17735045575a2a6cfda17c6657fc2172e9971687 Mon Sep 17 00:00:00 2001 From: Zainab Hammami Date: Fri, 21 Apr 2017 16:47:53 +0300 Subject: [PATCH 2/6] prime solved --- IsPrime/is_prime.php | 42 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 36 insertions(+), 6 deletions(-) diff --git a/IsPrime/is_prime.php b/IsPrime/is_prime.php index b0f4f7e..e5d8cda 100644 --- a/IsPrime/is_prime.php +++ b/IsPrime/is_prime.php @@ -3,7 +3,6 @@ Write a php function called is_prime that checks the number if it's prime or not! If number is prime print: "The number (X) is prime", if not print: "number (X) is not prime". --> - php-toy-problem @@ -13,19 +12,27 @@ "; + echo "Number $n is not Prime
"; } - for ($i = 2; $i <$n ; $i++) { - if ($n % $i === 0) { - echo "Number $n is not Prime
"; + elseif ($n > 1) { + for ($i = 2; $i <$n ; $i++) { + if ($n % $i === 0) { + $flag = true; + } } - elseif (!$n % $i === 0) { + if (!$flag) { echo "Number $n is Prime
"; } + elseif ($flag) { + echo "Number $n is not Prime
"; + } } } + is_prime(1); + is_prime(2); is_prime(3); is_prime(5); is_prime(6); @@ -33,7 +40,30 @@ function is_prime($n) { is_prime(8); is_prime(9); is_prime(10); + is_prime(11); + is_prime(12); + is_prime(13); + is_prime(14); + is_prime(15); ?> + From f09dd043cd03abde052cbbbf019af6dcb81f35cd Mon Sep 17 00:00:00 2001 From: Zainab Hammami Date: Tue, 25 Apr 2017 11:03:56 +0300 Subject: [PATCH 3/6] not done --- IsPrime/is_prime.php | 21 +---------- MilitaryTime/toMilitary.php | 75 +++++++++++++++++++++++++++++++++---- 2 files changed, 69 insertions(+), 27 deletions(-) diff --git a/IsPrime/is_prime.php b/IsPrime/is_prime.php index e5d8cda..a558dcf 100644 --- a/IsPrime/is_prime.php +++ b/IsPrime/is_prime.php @@ -8,7 +8,7 @@ php-toy-problem - +< - + diff --git a/MilitaryTime/toMilitary.php b/MilitaryTime/toMilitary.php index 9b98bff..96e282f 100644 --- a/MilitaryTime/toMilitary.php +++ b/MilitaryTime/toMilitary.php @@ -1,13 +1,72 @@ -/* -Is Prime? -Write a php function called is_prime that checks the number if it's prime or not! -If number is prime print: "The number (X) is prime", if not print: "number (X) is not prime". - */ + + + + + to-military-time + + + "; + toMilitary("3:50am"); + echo "
"; + toMilitary("4:30"); + + ?> + + + From ac56189660ac33dd21ba0acb1778b1a956b49d5a Mon Sep 17 00:00:00 2001 From: Zainab Hammami Date: Fri, 28 Apr 2017 20:21:05 +0300 Subject: [PATCH 4/6] toMilitary done --- MilitaryTime/toMilitary.php | 96 ++++++++++++++++--------------------- angrams/angrams.php | 44 +++++++++-------- includes/footer.php | 2 + includes/header.php | 6 +++ 4 files changed, 72 insertions(+), 76 deletions(-) create mode 100644 includes/footer.php create mode 100644 includes/header.php diff --git a/MilitaryTime/toMilitary.php b/MilitaryTime/toMilitary.php index 96e282f..746edd5 100644 --- a/MilitaryTime/toMilitary.php +++ b/MilitaryTime/toMilitary.php @@ -2,71 +2,55 @@ - - - - to-military-time - - - - var_dump($nan, is_nan($nan)); - die(); +
+ + +
- function toMilitary ($time) { - $str = ""; +"; - toMilitary("3:50am"); - echo "
"; - toMilitary("4:30"); - - ?> +if(isset($_POST['$time'])) { + toMilitary(); +} - - +?> + \ No newline at end of file diff --git a/angrams/angrams.php b/angrams/angrams.php index e510466..c4a9165 100644 --- a/angrams/angrams.php +++ b/angrams/angrams.php @@ -1,28 +1,32 @@ - + + + + -echo angrams("abc"); -function angrams($string){ -} -?> diff --git a/includes/footer.php b/includes/footer.php new file mode 100644 index 0000000..691287b --- /dev/null +++ b/includes/footer.php @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/includes/header.php b/includes/header.php new file mode 100644 index 0000000..0f7c6dd --- /dev/null +++ b/includes/header.php @@ -0,0 +1,6 @@ + + + + Toy-Problem + + \ No newline at end of file From 9047e289ac4c07e940771152c24db8275da00957 Mon Sep 17 00:00:00 2001 From: Zainab Hammami Date: Fri, 28 Apr 2017 20:31:43 +0300 Subject: [PATCH 5/6] is prime done --- IsPrime/is_prime.php | 72 +++++++++++++++++++------------------------- 1 file changed, 31 insertions(+), 41 deletions(-) diff --git a/IsPrime/is_prime.php b/IsPrime/is_prime.php index a558dcf..300f668 100644 --- a/IsPrime/is_prime.php +++ b/IsPrime/is_prime.php @@ -3,50 +3,40 @@ Write a php function called is_prime that checks the number if it's prime or not! If number is prime print: "The number (X) is prime", if not print: "number (X) is not prime". --> - - - php-toy-problem - - -< - - function is_prime($n) { - $flag = false; - if ($n === 1) { - echo "Number $n is not Prime
"; - } - elseif ($n > 1) { - for ($i = 2; $i <$n ; $i++) { - if ($n % $i === 0) { - $flag = true; - } - } - if (!$flag) { - echo "Number $n is Prime
"; - } - elseif ($flag) { - echo "Number $n is not Prime
"; +
+ + +
+ +"; + } + elseif ($n > 1) { + for ($i = 2; $i <$n ; $i++) { + if ($n % $i === 0) { + $flag = true; } } + if (!$flag) { + echo "Number $n is Prime
"; + } + elseif ($flag) { + echo "Number $n is not Prime
"; + } } +} - is_prime(1); - is_prime(2); - is_prime(3); - is_prime(5); - is_prime(6); - is_prime(7); - is_prime(8); - is_prime(9); - is_prime(10); - is_prime(11); - is_prime(12); - is_prime(13); - is_prime(14); - is_prime(15); - ?> - - - +if(isset($_POST['$number'])) { + is_prime(); +} +?> + \ No newline at end of file From 2b1f683a5efc17ba7b90c1fdaccbf2262860bb54 Mon Sep 17 00:00:00 2001 From: Zainab Hammami Date: Fri, 28 Apr 2017 20:57:55 +0300 Subject: [PATCH 6/6] angrams not done --- angrams/angrams.php | 41 ++++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/angrams/angrams.php b/angrams/angrams.php index c4a9165..ec12520 100644 --- a/angrams/angrams.php +++ b/angrams/angrams.php @@ -1,16 +1,3 @@ - - - - + + +
+ + +
+ + + + +