diff --git a/deeptrack/models/gans/cgan.py b/deeptrack/models/gans/cgan.py index 560449a5a..0eb33be68 100644 --- a/deeptrack/models/gans/cgan.py +++ b/deeptrack/models/gans/cgan.py @@ -104,8 +104,8 @@ def train_step(self, data): shape = tf.shape(disc_pred_real) valid, fake = tf.ones(shape), tf.zeros(shape) d_loss = ( - self.discriminator.compiled_loss(disc_pred_real, valid) - + self.discriminator.compiled_loss(disc_pred_fake, fake) + self.discriminator.compiled_loss(valid, disc_pred_real) + + self.discriminator.compiled_loss(fake, disc_pred_fake) ) / 2 # Compute gradient and apply gradient @@ -124,8 +124,8 @@ def train_step(self, data): batch_y_copies = [batch_y] * (self.num_losses - 1) g_loss = self.assemble.compiled_loss( - [assemble_output[0], *generated_image_copies], [valid, *batch_y_copies], + [assemble_output[0], *generated_image_copies], ) # Compute gradient and apply gradient diff --git a/deeptrack/models/gans/pcgan.py b/deeptrack/models/gans/pcgan.py index e728ffe5e..1ed0f557d 100644 --- a/deeptrack/models/gans/pcgan.py +++ b/deeptrack/models/gans/pcgan.py @@ -64,7 +64,7 @@ def __init__( metrics=[], **kwargs ): - super(PCGAN).__init__() + super().__init__() # Build and compile the discriminator self.discriminator = discriminator @@ -146,8 +146,8 @@ def train_step(self, data): shape = tf.shape(disc_pred_1) valid, fake = tf.ones(shape), tf.zeros(shape) d_loss = ( - self.discriminator.compiled_loss(disc_pred_1, valid) - + self.discriminator.compiled_loss(disc_pred_2, fake) + self.discriminator.compiled_loss(valid, disc_pred_1) + + self.discriminator.compiled_loss(fake, disc_pred_2) ) / 2 # Compute gradient and apply gradient @@ -168,12 +168,12 @@ def train_step(self, data): batch_y_copies = [batch_y] * (self.num_losses - 1) g_loss = self.assemble.compiled_loss( + [valid, perceptual_valid, *batch_y_copies], [ assemble_output[0], assemble_output[1], *generated_image_copies, ], - [valid, perceptual_valid, *batch_y_copies], ) # Compute gradient and apply gradient