add 20 to 30 for c++

publicarray · publicarray · commit f5daa930348e · 2015-03-06T11:50:10.000+10:00
fix for my whitespace from before- sorry
diff --git a/C++/15_cppBeginners.cpp b/C++/15_cppBeginners.cpp
@@ -4,6 +4,6 @@ using namespace std;
 
 int main()
 {
-	Burrito bo; // create an object
-	return 0;
+    Burrito bo; // create an object
+    return 0;
 }
diff --git a/C++/16_cppBeginners.cpp b/C++/16_cppBeginners.cpp
@@ -3,32 +3,32 @@ using namespace std;
 
 int main()
 {
-	int x = 10;
-	int y = 43;
+    int x = 10;
+    int y = 43;
 
-	if (x == 10){ // 10 equals 10 - true
-		cout << "omg i am preggy" << endl;
-	}
+    if (x == 10){ // 10 equals 10 - true
+        cout << "omg i am preggy" << endl;
+    }
 
-	if (x != 87){ // 10 is not equal to 87 - true
-		cout << "omg i am preggy" << endl;
-	}
+    if (x != 87){ // 10 is not equal to 87 - true
+        cout << "omg i am preggy" << endl;
+    }
 
-	if (x < 87){ // is 10 less than 87? - true
-		cout << "omg i am preggy" << endl;
-	}
+    if (x < 87){ // is 10 less than 87? - true
+        cout << "omg i am preggy" << endl;
+    }
 
-	if (x > 87){ // is 10 greater than 87? - false
-		cout << "omg i am preggy" << endl;
-	}
+    if (x > 87){ // is 10 greater than 87? - false
+        cout << "omg i am preggy" << endl;
+    }
 
-	if (x <= 10){ // is 10 less than or equal to 10? - true
-		cout << "omg i am preggy" << endl;
-	}
+    if (x <= 10){ // is 10 less than or equal to 10? - true
+        cout << "omg i am preggy" << endl;
+    }
 
-	if (x >= y){ // is 10 greater than or equal to 43 - false
-		cout << "omg i am preggy" << endl;
-	}
+    if (x >= y){ // is 10 greater than or equal to 43 - false
+        cout << "omg i am preggy" << endl;
+    }
 
-	return 0;
+    return 0;
 }
diff --git a/C++/17_cppBeginners.cpp b/C++/17_cppBeginners.cpp
@@ -3,18 +3,18 @@ using namespace std;
 
 int main()
 {
-	int age = 178;
+    int age = 178;
 
-	if(age>60){
-		cout << "wow you are old" << endl; // runs when the if statement is true
+    if(age>60){
+        cout << "wow you are old" << endl; // runs when the if statement is true
 
-		if (age>100){ // a nested if statement
-			cout << "why are you stil alive?" << endl; // this statement and the above statement runs when age > 100 is true.
-		}											   // so you get "wow you are old" and "why are you stil alive?" displayed on the screen.
+        if (age>100){ // a nested if statement
+            cout << "why are you stil alive?" << endl; // this statement and the above statement runs when age > 100 is true.
+        }                                              // so you get "wow you are old" and "why are you stil alive?" displayed on the screen.
 
-	}else{
-		cout << "you are young, get a job" << endl; // runs when the if statement is false
-	}
+    }else{
+        cout << "you are young, get a job" << endl; // runs when the if statement is false
+    }
 
-	return 0;
+    return 0;
 }
diff --git a/C++/18_cppBeginners.cpp b/C++/18_cppBeginners.cpp
@@ -3,13 +3,13 @@ using namespace std;
 
 int main()
 {
-	int bacon = 1; // start point
+    int bacon = 1; // start point
 
-	while(bacon <= 5){ // test to end the loop
-		cout << "bacon is " << bacon << endl;
-		bacon = bacon + 1; // number to increment by
-		                   // HINT - there is a shorthand version: 'bacon = bacon + 1' is the same as 'bacon++';
-	}
+    while(bacon <= 5){ // test to end the loop
+        cout << "bacon is " << bacon << endl;
+        bacon = bacon + 1; // number to increment by
+                           // HINT - there is a shorthand version: 'bacon = bacon + 1' is the same as 'bacon++';
+    }
 
-	return 0;
+    return 0;
 }
diff --git a/C++/19_cppBeginners.cpp b/C++/19_cppBeginners.cpp
@@ -3,17 +3,17 @@ using namespace std;
 
 int main()
 {
-	int x = 1; // loop start point
-	int number; // store the number the user enters
-	int total = 0; // store the sum of the numbers
+    int x = 1; // loop start point
+    int number; // store the number the user enters
+    int total = 0; // store the sum of the numbers
 
-	while (x <= 5){
-		cin >> number; // ask the user for a number and store it in the number variable
-		total = total + number; // add the number to the total. HINT - the shorthand version is: total += number;
-		x++; // is the same as: x = x + 1;
-	}
+    while (x <= 5){
+        cin >> number; // ask the user for a number and store it in the number variable
+        total = total + number; // add the number to the total. HINT - the shorthand version is: total += number;
+        x++; // is the same as: x = x + 1;
+    }
 
-	cout << "Your total is " << total << endl;
+    cout << "Your total is " << total << endl;
 
-	return 0;
+    return 0;
 }
diff --git a/C++/20_cppBeginners.cpp b/C++/20_cppBeginners.cpp
@@ -3,23 +3,23 @@ using namespace std;
 
 int main()
 {
-	int age;
-	int ageTotal = 0;
-	int numberOfPeopleEntered = 0;
+    int age;
+    int ageTotal = 0;
+    int numberOfPeopleEntered = 0;
 
-	cout << "Enter first persons age or -1 to quit" << endl;
-	cin >> age;
+    cout << "Enter first persons age or -1 to quit" << endl;
+    cin >> age;
 
-	while(age != -1){
-		ageTotal = ageTotal + age; // or shorthand: ageTotal += age;
-		numberOfPeopleEntered++;
+    while(age != -1){
+        ageTotal = ageTotal + age; // or shorthand: ageTotal += age;
+        numberOfPeopleEntered++;
 
-		cout << "Enter next persons age or -1 to quit" << endl;
-		cin >> age;
-	}
+        cout << "Enter next persons age or -1 to quit" << endl;
+        cin >> age;
+    }
 
-	cout << "Number of peoople eneted: " << numberOfPeopleEntered << endl;
-	cout << "Average age: " << ageTotal/numberOfPeopleEntered;
+    cout << "Number of peoople eneted: " << numberOfPeopleEntered << endl;
+    cout << "Average age: " << ageTotal/numberOfPeopleEntered;
 
-	return 0;
+    return 0;
 }
diff --git a/C++/21_cppBeginners.cpp b/C++/21_cppBeginners.cpp
@@ -0,0 +1,42 @@
+#include <iostream>
+using namespace std;
+
+int main()
+{
+
+    int a = 10, b = 10, c = 10, d = 10, e = 10, x;
+
+    a += 5; // is the same as a = a + 5;
+    cout << a << endl;
+
+    b -= 5; // is the same as b = b - 5;
+    cout << b << endl;
+
+    c *= 5; // is the same as c = c * 5;
+    cout << c << endl;
+
+    d /= 5; // is the same as d = d / 5;
+    cout << d << endl;
+
+    e %= 3; // is the same as e = e % 3; Modulus Operator (%) - divides the values and than returns the remainder - 10 % 3 = 1
+    cout << e << endl;
+
+
+    // increment operators
+    x = 20;
+    cout << x++ << endl; // first it prints the value than it will increment x - 20
+    cout << x << endl; // 21
+
+    x = 20;
+    cout << ++x << endl; // increments first and than it will print the value of x - 21
+    cout << x << endl; // 21
+
+    x = 20;
+    cout << x-- << endl; // first it prints the value than it will decrement x - 20
+    cout << x << endl; // 19
+
+    x = 20;
+    cout << --x << endl; // decrement first and than it will print the value of x - 19
+    cout << x << endl; // 19
+
+}
diff --git a/C++/22_cppBeginners.cpp b/C++/22_cppBeginners.cpp
@@ -0,0 +1,15 @@
+#include <iostream>
+using namespace std;
+
+int main()
+{
+
+    for (int x = 1; x < 10; x++){ // initialisation; loop continuation condition; increment
+        cout << x << endl;
+    }
+
+    for (int y = 5; y < 50; y+=5){
+        cout << y << endl;
+    }
+
+}
diff --git a/C++/23_cppBeginners.cpp b/C++/23_cppBeginners.cpp
@@ -0,0 +1,16 @@
+#include <iostream>
+#include <cmath> // include cmath library
+using namespace std;
+
+int main()
+{
+
+    float a; // amount
+    float p = 10000; // principal amount - start amount
+    float r = .03; // interest rate
+
+    for (int day = 1; day <=30; day++){
+        a = p * pow(1+r, day);
+        cout << day << " ----- " << a << endl;
+    }
+}
diff --git a/C++/24_cppBeginners.cpp b/C++/24_cppBeginners.cpp
@@ -0,0 +1,14 @@
+#include <iostream>
+using namespace std;
+
+int main()
+{
+
+    int x = 99;
+
+    do{     // will run at least one time
+        cout <<x<<endl;
+        x++;
+    }while(x<10); // test is false
+
+}
diff --git a/C++/25_cppBeginners.cpp b/C++/25_cppBeginners.cpp
@@ -0,0 +1,25 @@
+#include <iostream>
+using namespace std;
+
+int main()
+{
+
+    int age = 21;
+
+    switch(age){
+        case 16:
+            cout << "hey you can drive now!" << endl;
+            break; // end the case otherwise it will continue to run case 18, case 21 and default
+        case 18:
+            cout << "go buy some lotto ticekts~!" << endl;
+            break; // end the case otherwise it will continue to run case 21 and default
+        case 21:
+            cout << "buy me some beer" << endl;
+            break; // end the case otherwise it will continue and run default
+        default:
+            cout << "sorry you get nothign" << endl;
+            // no break because it reached the end anyway.
+
+    }
+
+}
diff --git a/C++/26_cppBeginners.cpp b/C++/26_cppBeginners.cpp
@@ -0,0 +1,17 @@
+#include <iostream>
+using namespace std;
+
+int main()
+{
+
+    int age = 23;
+    int money = 650;
+
+    if(age>21 && money>500){ // AND operator
+        cout << "you are3 allowed in!" << endl; // both tests must be true for this code to run | if any one case is false than this code will not run
+    }
+
+    if(age>21 || money>500){ // OR operator
+        cout << "you are3 allowed in!" << endl; // one test must be true for this code to run
+    }
+}
diff --git a/C++/27_cppBeginners.cpp b/C++/27_cppBeginners.cpp
@@ -0,0 +1,14 @@
+#include <iostream>
+#include <cstdlib> // include c standard library
+#include <ctime> // to access the time of the computer
+using namespace std;
+
+int main()
+{
+    srand(time(0)); // seed random number from the clock
+
+    for (int x = 1; x<25;x++){
+        cout << 1+(rand()%6) << endl; // 6 <- the number of values you want to generate
+    }
+
+}
diff --git a/C++/28_cppBeginners.cpp b/C++/28_cppBeginners.cpp
@@ -0,0 +1,13 @@
+#include <iostream>
+using namespace std;
+
+int volume(int l=1, int w=1, int h=1); // default values/parameters in function prototype
+
+int main()
+{
+    cout << volume (5) << endl; // l=5, w=1, h=1 -> 5*1*1
+}
+
+int volume(int l, int w, int h){
+    return l*w*h;
+}
diff --git a/C++/29_cppBeginners.cpp b/C++/29_cppBeginners.cpp
@@ -0,0 +1,18 @@
+#include <iostream>
+using namespace std;
+void bucky();
+
+int tuna = 69; // global variable/global scope
+
+int main()
+{
+    int tuna = 20; // local variable/local scope
+    cout << tuna << endl; // local tuna
+    cout << ::tuna << endl; // accessing global tuna using the unary scope resolution operator (::)
+
+    bucky();
+}
+
+void bucky() { // bucky() can't access the tuna that is inside the main function
+    cout << tuna << endl; // global tuna
+}
diff --git a/C++/30_cppBeginners.cpp b/C++/30_cppBeginners.cpp
@@ -0,0 +1,18 @@
+#include <iostream>
+using namespace std;
+
+void printNumber(int x){
+    cout << "i am printing an integer " << x << endl;
+}
+void printNumber(float x){
+    cout << "now i am printg an float" << x << endl;
+}
+
+int main()
+{
+    int a = 54;
+    float b = 32.4896;
+
+    printNumber(a);
+    printNumber(b);
+}
diff --git a/C++/Burrito.cpp b/C++/Burrito.cpp
@@ -1,4 +1,4 @@
-// 15_cppBegginers
+// 15_cppBeginners
 
 #include "Burrito.h" // insert the header file
 #include <iostream>
@@ -7,5 +7,5 @@ using namespace std;
 
 Burrito::Burrito() // constructor
 {
-	cout << "i am a bananan" << endl;
+    cout << "i am a bananan" << endl;
 }
diff --git a/C++/Burrito.h b/C++/Burrito.h

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@ using namespace std;`
`4`	`4`
`5`	`5`	`int main()`
`6`	`6`	`{`
`7`		`- Burrito bo; // create an object`
`8`		`- return 0;`
	`7`	`+ Burrito bo; // create an object`
	`8`	`+ return 0;`
`9`	`9`	`}`