Commit 33fd0134 authored by Bannier Delphine's avatar Bannier Delphine
Browse files

update with evaluation score

parent a4e52106
...@@ -89,6 +89,7 @@ def create_hybrid(nb_attributes,shape=(240,240,1)): ...@@ -89,6 +89,7 @@ def create_hybrid(nb_attributes,shape=(240,240,1)):
cnn = create_cnn(*shape,type_cnn='hybrid') cnn = create_cnn(*shape,type_cnn='hybrid')
combinedInput = concatenate([mlp.output, cnn.output]) combinedInput = concatenate([mlp.output, cnn.output])
x = Dense(4, activation="tanh")(combinedInput) #tanh x = Dense(4, activation="tanh")(combinedInput) #tanh
x = Dropout(0.5)(x)
x = Dense(1, activation="linear")(x) x = Dense(1, activation="linear")(x)
model = Model(inputs=[mlp.input, cnn.input], outputs=x) model = Model(inputs=[mlp.input, cnn.input], outputs=x)
return model return model
...@@ -162,6 +163,7 @@ def create_hybrid_transfer(nb_attributes,new_model, custom_model, modify_name,in ...@@ -162,6 +163,7 @@ def create_hybrid_transfer(nb_attributes,new_model, custom_model, modify_name,in
cnn = create_transfer_learning(new_model, custom_model, modify_name,input_channel) cnn = create_transfer_learning(new_model, custom_model, modify_name,input_channel)
combinedInput = concatenate([mlp.output, cnn.output]) combinedInput = concatenate([mlp.output, cnn.output])
x = Dense(4, activation="tanh")(combinedInput) x = Dense(4, activation="tanh")(combinedInput)
x = Dropout(0.5)(x)
x = Dense(1, activation="linear")(x) x = Dense(1, activation="linear")(x)
model = Model(inputs=[mlp.input, cnn.input], outputs=x) model = Model(inputs=[mlp.input, cnn.input], outputs=x)
return model return model
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment