Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
fe2e5c7
have made SphereCircumference
AhmedOsama0099 Feb 26, 2020
dcfa9b0
Merge pull request #1 from gqozgalz/master
farah-afifi Feb 27, 2020
ed1d255
Added New Class
Berserk132 Feb 28, 2020
e700590
Add summation series class
AhmadEbrahim Feb 29, 2020
7987add
Merge pull request #2 from AhmadEbrahim/master
AhmadEbrahim Feb 29, 2020
8fdbf37
Revert "Merge pull request #2 from AhmadEbrahim/master"
farah-afifi Feb 29, 2020
61cbede
Create Sphere_Volume.java
esraa2367 Feb 29, 2020
d475a4e
Revert "Merge pull request #1 from gqozgalz/master"
farah-afifi Feb 29, 2020
109c1b9
Revert "InitCommit"
farah-afifi Feb 29, 2020
10d0ee8
Merge branch 'Sphere-Volume'
farah-afifi Feb 29, 2020
9de4a5e
Revert "Revert "InitCommit""
AhmedSayedIbrahim239 Feb 29, 2020
2c8e384
Merge branch 'SphereArea'
farah-afifi Feb 29, 2020
3c39f5c
Merge branch 'master' of https://github.com/farah-afifi/git_assignmen…
farah-afifi Feb 29, 2020
465acf6
this is SphereCircumference class id:20170010
AhmedOsama0099 Feb 29, 2020
e312f65
I created new class called Sphere_Volume
esraa2367 Feb 29, 2020
9fecbd2
Add summation series class ID:20170006
AhmadEbrahim Feb 29, 2020
8e0f262
fibonacci Done
farah-afifi Mar 1, 2020
ad03c7b
Merge branch 'SphereCircumference'
farah-afifi Mar 1, 2020
33c2842
Merge branch 'SummationSeries'
farah-afifi Mar 1, 2020
c6bf3b0
Merge branch 'Sphere-Volume'
farah-afifi Mar 1, 2020
0e0992c
almost all classes have been merged
farah-afifi Mar 1, 2020
25070df
Revert "almost all classes have been merged"
farah-afifi Mar 1, 2020
9af3bbf
Revert "Merge branch 'Sphere-Volume'"
farah-afifi Mar 1, 2020
a482c01
Revert "Merge branch 'SummationSeries'"
farah-afifi Mar 1, 2020
c1f512a
Revert "Merge branch 'SphereCircumference'"
farah-afifi Mar 1, 2020
4238e33
Revert "Merge branch 'Sphere-Volume'"
farah-afifi Mar 1, 2020
ecedb8a
Revert "fibonacci Done"
farah-afifi Mar 1, 2020
384eebb
Create circleV.java
Ahmed01151526059 Mar 1, 2020
defcc48
reverting everything to square 1
farah-afifi Mar 1, 2020
ef53994
fibonacci DONE
farah-afifi Mar 1, 2020
5d16811
circle volume
Ahmed01151526059 Mar 1, 2020
84b2a42
circle volume
Ahmed01151526059 Mar 1, 2020
04a91f0
added SphereCircumference class id: 20170010
AhmedOsama0099 Mar 1, 2020
ae946ec
20170021-Added SphereArea Class
Berserk132 Mar 1, 2020
fde848b
Merge pull request #5 from farah-afifi/20170024/circle-volume
Berserk132 Mar 1, 2020
911f0c9
Add summation series class ID:20170006
AhmadEbrahim Mar 2, 2020
143a121
Sphere Volume Done
esraa2367 Mar 2, 2020
9610efd
Sphere Volume implementation
esraa2367 Mar 2, 2020
61e2e7f
Merge pull request #10 from farah-afifi/20170021-SphereArea
farah-afifi Mar 2, 2020
aa413b6
Merge pull request #6 from farah-afifi/20170351-fibonnacci
esraa2367 Mar 2, 2020
7a649e2
Merge pull request #9 from farah-afifi/20170010-SphereCircumference
esraa2367 Mar 2, 2020
af7745d
Merge pull request #12 from farah-afifi/Sphere-Volume-ID-20170043
AhmedOsama0099 Mar 2, 2020
a72da98
Merge pull request #11 from farah-afifi/20170006SummationSeries
AhmedAlsaket Mar 2, 2020
6901849
Create CircleArea.java
HamidoNasef Mar 2, 2020
27fb4f4
Update CircleArea.java
HamidoNasef Mar 2, 2020
aaa3b40
Merge pull request #14 from farah-afifi/20170162_CircleArea
farah-afifi Mar 2, 2020
c09c029
volume of circle
Ahmed01151526059 Mar 3, 2020
1499e00
volume of circle
Ahmed01151526059 Mar 3, 2020
92e9cb2
20170024-circle volume
Ahmed01151526059 Mar 3, 2020
72ab32b
volume of circle 20170024
Ahmed01151526059 Mar 3, 2020
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
17 changes: 17 additions & 0 deletions src/CircleArea.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@

public class CircleArea implements ISubscriber{

@Override
public void notifySubscriber(String input) {
double reduis=Double.parseDouble(input);
System.out.println("Area= "+area(reduis));

}


public double area(double reduis) {
double setArea=Math.PI * reduis *reduis;
return setArea;
}
}

25 changes: 25 additions & 0 deletions src/SphereArea.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import java.sql.SQLOutput;

public class SphereArea implements ISubscriber {


@Override
public void notifySubscriber(String input) {

double R = Double.parseDouble(input);

double sphereArea = calcSphereArea(R);

System.out.println("The Sphere Area = " + sphereArea);

}

double calcSphereArea(double r){

double sphereArea = 0.0;

sphereArea = 4 * Math.PI * Math.pow(r, 2);

return sphereArea;
}
}
24 changes: 24 additions & 0 deletions src/SphereCircumference.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
public class SphereCircumference implements ISubscriber{
private double getSphereCircumference(double r) {
double area=2*Math.PI*r;
return area;
}
@Override
public void notifySubscriber(String input) {
double r;
try {
r=Double.parseDouble(input);
} catch (Exception e) {
System.out.println("enter a real number");
return;
}

if(r<0) {
System.out.println("r must be >= 0");
return;
}
System.out.println("Area= "+getSphereCircumference(r));

}

}
17 changes: 17 additions & 0 deletions src/Sphere_Volume.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@

public class Sphere_Volume implements ISubscriber {
@Override
public void notifySubscriber(String input) {

double Radius = Double.parseDouble(input);
if(Radius < 0)
{
System.out.println("Radius can not be equal nagative number");
}
else {
double Volume = (4/3) * Math.PI * Math.pow(Radius, 3);
System.out.println("Volume = "+ Volume);
}

}
}
15 changes: 15 additions & 0 deletions src/SummationSeries.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
public class SummationSeries implements ISubscriber
{
@Override
public void notifySubscriber(String input)
{
int end = Integer.parseInt(input);
int sum = sigma(end);
System.out.println("The sum from 1 to the end number = " + sum);
}

public static int sigma(int end)
{
return (end*(end+1))/2;
}
}
14 changes: 14 additions & 0 deletions src/circleV.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@

public class circleV implements ISubscriber {
@Override
public void notifySubscriber(String input) {

double r = Double.parseDouble(input);


double volume= Math.PI*r*r;

System.out.println("Volume is:" +volume);

}
}
22 changes: 22 additions & 0 deletions src/fibonacci.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
public class fibonacci implements ISubscriber {

int calcFib(String input){
int x = Integer.parseInt(input);
int ans = 0 ;
int fibN_1 = 1 ,fibN_2 = 1 ,fibN = 0;

for(int i = 2 ; i < x ; i ++) {
fibN = fibN_1 + fibN_2;
fibN_2 = fibN_1;
fibN_1 = fibN;
}
return fibN;
}
@Override
public void notifySubscriber(String input) {
// TODO Auto-generated method stub

System.out.println("fibonacci of "+input+ " is " + calcFib(input));

}
}