mirror of
https://github.com/DeaDvey/mathgenerator.git
synced 2025-11-28 14:35:23 +01:00
Add getGenList function
This commit is contained in:
@@ -1,8 +1,8 @@
|
|||||||
import random
|
import random
|
||||||
|
|
||||||
genList = []
|
genList = []
|
||||||
# || Generator class
|
|
||||||
|
|
||||||
|
# || Generator class
|
||||||
class Generator:
|
class Generator:
|
||||||
def __init__(self, title, id, generalProb, generalSol, func):
|
def __init__(self, title, id, generalProb, generalSol, func):
|
||||||
self.title = title
|
self.title = title
|
||||||
@@ -10,7 +10,7 @@ class Generator:
|
|||||||
self.generalProb = generalProb
|
self.generalProb = generalProb
|
||||||
self.generalSol = generalSol
|
self.generalSol = generalSol
|
||||||
self.func = func
|
self.func = func
|
||||||
genList.append(self)
|
genList.append([id, title, self])
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return str(self.id) + " " + self.title + " " + self.generalProb + " " + self.generalSol
|
return str(self.id) + " " + self.title + " " + self.generalProb + " " + self.generalSol
|
||||||
@@ -18,12 +18,15 @@ class Generator:
|
|||||||
def __call__(self):
|
def __call__(self):
|
||||||
return self.func()
|
return self.func()
|
||||||
|
|
||||||
# || CallbyId
|
# || Non-generator Functions
|
||||||
def genById(id):
|
def genById(id):
|
||||||
generator = genList[id]
|
generator = genList[id][2]
|
||||||
return(generator())
|
return(generator())
|
||||||
|
|
||||||
# || Functions
|
def getGenList():
|
||||||
|
return(genList)
|
||||||
|
|
||||||
|
# || Generator Functions
|
||||||
|
|
||||||
def additionFunc(maxSum = 99, maxAddend = 50):
|
def additionFunc(maxSum = 99, maxAddend = 50):
|
||||||
a = random.randint(0, maxAddend)
|
a = random.randint(0, maxAddend)
|
||||||
|
|||||||
Reference in New Issue
Block a user