Skip to content

Commit b4234f8

Browse files
author
Olcay Taner YILDIZ
committed
Updated models accordingly.
1 parent 953fc60 commit b4234f8

10 files changed

Lines changed: 0 additions & 91 deletions

File tree

Classification/Model/DummyModel.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,6 @@ def constructor2(self, fileName: str):
3030
self.distribution = Model.loadClassDistribution(inputFile)
3131
inputFile.close()
3232

33-
def __init__(self, trainSet: object = None):
34-
if isinstance(trainSet, InstanceList):
35-
self.constructor1(trainSet)
36-
elif isinstance(trainSet, str):
37-
self.constructor2(trainSet)
38-
3933
def predict(self, instance: Instance) -> str:
4034
"""
4135
The predict method takes an Instance as an input and returns the entry of distribution which has the maximum

Classification/Model/NeuralNetwork/DeepNetworkModel.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -112,16 +112,6 @@ def constructor2(self, fileName: str):
112112
self.__activation_function = self.loadActivationFunction(inputFile)
113113
inputFile.close()
114114

115-
def __init__(self,
116-
trainSet: object = None,
117-
validationSet: InstanceList = None,
118-
parameters: DeepNetworkParameter = None):
119-
if isinstance(trainSet, InstanceList):
120-
self.constructor1(trainSet, validationSet, parameters)
121-
elif isinstance(trainSet, str):
122-
super().__init__()
123-
self.constructor2(trainSet)
124-
125115
def __allocateWeights(self, parameters: DeepNetworkParameter):
126116
"""
127117
The allocateWeights method takes DeepNetworkParameters as an input. First it adds random weights to the list

Classification/Model/NeuralNetwork/LinearPerceptronModel.py

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -71,18 +71,6 @@ def constructor3(self, fileName: str):
7171
self.W = self.loadMatrix(inputFile)
7272
inputFile.close()
7373

74-
def __init__(self, trainSet: object = None, validationSet: InstanceList = None,
75-
parameters: LinearPerceptronParameter = None):
76-
if trainSet is not None:
77-
if isinstance(trainSet, InstanceList):
78-
if validationSet is None:
79-
self.constructor1(trainSet)
80-
else:
81-
self.constructor2(trainSet, validationSet, parameters)
82-
elif isinstance(trainSet, str):
83-
super().__init__()
84-
self.constructor3(trainSet)
85-
8674
def calculateOutput(self):
8775
"""
8876
The calculateOutput method calculates the Matrix y by multiplying Matrix W with Vector x.

Classification/Model/NeuralNetwork/MultiLayerPerceptronModel.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -108,16 +108,6 @@ def constructor3(self, fileName: str):
108108
self.__activation_function = self.loadActivationFunction(inputFile)
109109
inputFile.close()
110110

111-
def __init__(self,
112-
trainSet: object = None,
113-
validationSet: InstanceList = None,
114-
parameters: MultiLayerPerceptronParameter = None):
115-
if isinstance(trainSet, InstanceList):
116-
self.constructor2(trainSet, validationSet, parameters)
117-
elif isinstance(trainSet, str):
118-
super().__init__()
119-
self.constructor3(trainSet)
120-
121111
def calculateOutput(self):
122112
"""
123113
The calculateOutput method calculates the forward single hidden layer by using Matrices W and V.

Classification/Model/NonParametric/KnnModel.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,6 @@ def constructor2(self, fileName: str):
4646
self.__data = self.loadInstanceList(inputFile)
4747
inputFile.close()
4848

49-
def __init__(self,
50-
data: object = None,
51-
k: int = None,
52-
distanceMetric: DistanceMetric = None):
53-
if isinstance(data, InstanceList):
54-
self.constructor1(data, k, distanceMetric)
55-
elif isinstance(data, str):
56-
self.constructor2(data)
57-
5849
def predict(self, instance: Instance) -> str:
5950
"""
6051
The predict method takes an Instance as an input and finds the nearest neighbors of given instance. Then

Classification/Model/Parametric/KMeansModel.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,6 @@ def constructor2(self, fileName: str):
4444
self.__class_means = self.loadInstanceList(inputFile)
4545
inputFile.close()
4646

47-
def __init__(self,
48-
priorDistribution: object = None,
49-
classMeans: InstanceList = None,
50-
distanceMetric: DistanceMetric = None):
51-
if isinstance(priorDistribution, DiscreteDistribution):
52-
self.constructor1(priorDistribution, classMeans, distanceMetric)
53-
elif isinstance(priorDistribution, str):
54-
self.constructor2(priorDistribution)
55-
5647
def calculateMetric(self,
5748
instance: Instance,
5849
Ci: str) -> float:

Classification/Model/Parametric/LdaModel.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,6 @@ def constructor2(self, fileName: str):
4646
self.loadWandW0(inputFile, size)
4747
inputFile.close()
4848

49-
def __init__(self,
50-
priorDistribution: object = None,
51-
w: dict = None,
52-
w0: dict = None):
53-
if priorDistribution is not None:
54-
if isinstance(priorDistribution, DiscreteDistribution):
55-
self.constructor1(priorDistribution, w, w0)
56-
elif isinstance(priorDistribution, str):
57-
self.constructor2(priorDistribution)
58-
5949
def loadWandW0(self,
6050
inputFile: TextIOWrapper,
6151
size: int):

Classification/Model/Parametric/NaiveBayesModel.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,6 @@ def constructor2(self, fileName: str):
3939
self.__class_attribute_distributions = None
4040
inputFile.close()
4141

42-
def __init__(self, priorDistribution: object = None):
43-
if isinstance(priorDistribution, DiscreteDistribution):
44-
self.constructor1(priorDistribution)
45-
elif isinstance(priorDistribution, str):
46-
self.constructor2(priorDistribution)
47-
4842
def initForContinuous(self,
4943
classMeans: dict,
5044
classDeviations: dict):

Classification/Model/Parametric/QdaModel.py

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,6 @@ def constructor2(self, fileName: str):
5555
self.__W[c] = matrix
5656
inputFile.close()
5757

58-
def __init__(self,
59-
priorDistribution: object = None,
60-
W: dict = None,
61-
w: dict = None,
62-
w0: dict = None):
63-
super().__init__()
64-
if isinstance(priorDistribution, DiscreteDistribution):
65-
self.constructor3(priorDistribution, W, w, w0)
66-
elif isinstance(priorDistribution, str):
67-
self.constructor2(priorDistribution)
68-
6958
def calculateMetric(self,
7059
instance: Instance,
7160
Ci: str) -> float:

Classification/Model/RandomModel.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,6 @@ def constructor2(self, fileName: str):
4242
self.__class_labels.append(inputFile.readline().strip())
4343
inputFile.close()
4444

45-
def __init__(self,
46-
classLabels: object = None,
47-
seed: int = None):
48-
if isinstance(classLabels, list):
49-
self.constructor1(classLabels, seed)
50-
elif isinstance(classLabels, str):
51-
self.constructor2(classLabels)
52-
5345
def predict(self, instance: Instance) -> str:
5446
"""
5547
The predict method gets an Instance as an input and retrieves the possible class labels as an ArrayList. Then

0 commit comments

Comments
 (0)