Merge pull request #42 from prabhus489/dev

Dev to master Release

Addition.py

@@ -1,10 +1,9 @@
-# To add all numbers in a collection
-def AddCollection(inputValues):
-    sum = 0    
-    for num in inputValues:
-        sum +=num
-    return sum
+#Python program to add two numbers using function
 
-# To add two numbers
-def AddTwoNumbers(num1, num2):
-    return num1 + num2
+def add_num(a,b):#function for addition
+    sum=a+b;
+    return sum; #return value
+num1=int(input("input the number one: "))#input from user for num1
+num2=int(input("input the number one :"))#input from user for num2
+
+print("The sum is",add_num(num1,num2))#call te function

PercentageInteger.py

@@ -11,4 +11,6 @@ def GetPercentFloat(first, second, integer = True):
 num2 = float(input("Enter Second number: "))
 
 GetPercentFloat(num1, num2)
-print(GetPercentFloat(num1, num2))
+print(GetPercentFloat(num1, num2))
+
+#This is a comment by Raj

SimpleCalculator.py

@@ -53,3 +53,5 @@ def divide(x, y):
 
         else:
             print("Invalid Input")
+
+# This is a comment being added

Subtraction.py

@@ -0,0 +1,9 @@
+#python program to subtract two numbers using function
+
+def subtraction(x,y):  #function definifion for subtraction
+    sub=x-y
+    return sub
+num1=int(input("please enter first number: "))#input from user to num1
+num2=int(input("please enter second number: "))#input from user to num2
+
+print("Subtraction is: ",subtraction(num1,num2))#call the function

calculator.py

@@ -1,12 +1,14 @@
 import sys
-
 from PyQt5.QtWidgets import QApplication, QVBoxLayout, QGridLayout, QPushButton, QLabel, QTextEdit
 from PyQt5.QtWidgets import QWidget
 from PyQt5.QtCore import Qt
 import SimpleCalculator as calc_func
 
 
 class Calculator(QWidget):
+"""
+Class for initializing the UI and calculator functionalities
+"""
 
     def __init__(self):
         super().__init__()
@@ -19,6 +21,9 @@ def __init__(self):
         self.op_pressed = False
 
     def create_ui(self):
+	"""
+	Class for creating the calculator UI
+	"""
         self.setWindowTitle('Calculator')
         vBoxLayout = QVBoxLayout()
         gridLayout = QGridLayout()
@@ -52,6 +57,9 @@ def create_ui(self):
         self.show()
 
     def button_clicked(self):
+	"""
+	Method for creating the connection between UI element and the functionality
+	"""
         # TODO: Implement Calculator logic
         sender = self.sender()
         button_txt = sender.text()
@@ -80,6 +88,9 @@ def button_clicked(self):
         self.result_display.setAlignment(Qt.AlignRight)
 
     def perform_op():
+	"""
+	Method for performing the arithmetic operations 
+	"""
         if self.current_op == 'add':
             result = calc_func.add(self.x, self.y)
         elif self.current_op == 'subtract':
@@ -100,3 +111,5 @@ def perform_op():
     app = QApplication(sys.argv)
     calc = Calculator()
     sys.exit(app.exec_())
+
+# This is a comment by Raj

division.py

@@ -0,0 +1,8 @@
+def divNum(a,b):#function definision
+  return a/b
+num1=int(input("Please input the number for num1: "));
+#Ask and reading the input from user for num1
+num2=int(input("Please input the number for num2: "));
+#Ask and reading the input from user for num2
+print("Division of given numbers is:",divNum(num1,num2))
+#call the function

exponent.py

@@ -0,0 +1,13 @@
+# Python Program to find Power of a Number
+
+number = int(input(" Please Enter any Positive Integer : "))
+exponent = int(input(" Please Enter Exponent Value : "))
+
+power = 1
+i = 1
+
+while(i <= exponent):
+    power = power * number
+    i = i + 1
+
+print("The Result of {0} Power {1} = {2}".format(number, exponent, power))

multiply.py

@@ -7,4 +7,8 @@ def MultiplyCollection(inputValues):
 
 # To multiply two numbers
 def MultiplyTwoNumbers(num1, num2):
-    return num1 * num2
+    return num1 * num2
+
+# To multiply two numbers
+def MultiplyNumbers(a, b):
+    return a * b

test_calculator.py

@@ -28,3 +28,5 @@ def test_divide(self):
   ct.test_subtract()
   ct.test_multiply()
   ct.test_divide()
+
+# This is a comment added by Raj