diff --git a/.creds b/.creds new file mode 100644 index 000000000..c82a8f09c --- /dev/null +++ b/.creds @@ -0,0 +1 @@ +{"username": "Ruge", "firebase": {"type": "service_account", "project_id": "cellpack-data-582d6", "private_key_id": "27a3ec0777551f79a89c49ebfbdc4462cc42a6a0", "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC+gpS2kk35dEnz\nx2fv2MPXvEvIFTkjzcLyc9+m19NzdQhBzEBMrEmu7tl5RPiEznkyV2gC07ZF5ZBO\nQ3H43HRHw5N3ojyXO8PUG+u7T5Gx7eXo9YfBsAfxO/zru5zUXBZVmkqjK+qKtUs2\nKOKzYks8cr62GHor0eYVAB19rXff5q/nbUruqRVA6Qhpi0i7dv8X3UoOo7Xu6sV8\nKA/BxOclOb+7VrEwLbS3jGPnEOiNdI6WQx4ekyFi6Ulnlp5IGIj/pxvUqp1RkDP6\n1oGqdEPAdi/nfUeYYnQdi18mYpAepNLAd6UToAfe/w49KH9p3TGGgT4LS0/3parS\nBdZNdFS7AgMBAAECggEAUTG/JvbA89XbpOHyStdEVKCEXdCpyzgpY4L+KZInpTgW\nXlCqgOMW/k7+8f/yuUt0fP+irT3FHBIkiC6XlxyCFInmwmCrWTtYEYEa3XiinEZL\nrBdlFigromVSPLf3tcxPmolJUTTo39g3p2wSfqigbzFqVZqmCyII4R9s8kDp68se\nIcaW+RAyUiBCq5Wi7d4s6bOtq8nS7QMw92X8tQ0cbD4346ewjydYnnQSbDElwfYk\n2VByoPoJorxsRKSVsKSikZOP/NvRz/+wqYKf1g9zI4g+lJFkZYOCMv/5e0ADdjy6\nDvvkYDH8sar3L+Flw306sI3AlVvulT6LSNh9ASatLQKBgQDexxSXo5AoHeSRk8td\nbc6VtzSpEYcviauC1lAL4+U/8mKn4PihwOIjN+qRyKqFojHCysHU7dMsAu73EhUz\nlBSB4U+vORVZ4xhmcZsgoC/f5aLeksAqK72+bezl62kMizHHvjsjsW+s76FbMbZl\nSk44g7MsqZO5nu5PYDqed5joXQKBgQDa66FenSqTO0p6yV+t08NlbtwGOovc4pl8\n9gpZj8vaDbEpVRSjzcDgeRhz5IZwFqejiEGzybP81A9kfpE81DEqNLLxjQRA3MD2\nlxB2y/ovpkcDuvWXerHT7m1WsrgV7xwP0Y4wCnghKQck0b6zFWrLsyZpKBTFbnpg\nMXEf8d5/9wKBgQDaDlsloj+0RK45oERqitSuzsiIxFNiQIrUYhmvyb3XPdU7JYW4\nLigq+MxtLdFbREsYs4XOeYs9hRGKXPTLq6H3DycECAfSF+sGOyTwZlr1+LvWyCW4\nIWB0SPycgDQuxwBO1vDkGwWIbHWv4ZT6yCSQRLjYepPSGLKCl1pJSh8tMQKBgC04\n85K54KudWdtXcd5Umk5/wg+/VFkCrjY0FRs/KxsWLPyeyK61uBwmp7h5ApRw+Zw8\nb2YWSon1vGBEDPiF1MolLLndKX3EnE/UEOCZbksdjBnnKwhpngZrgEaikIhnZmKW\nJUsjPoGLGiCu+ze/OtptXYfncbL/CWSJkhbJPe8tAoGBAJ8btGj4UGs4sl1xU9AE\nNT7tPIAvuRSQnMLQiPIn2tioVLFrYL//Rj1r++D1CfWJLl0HEXM9yGPZRCm3I/oA\np24wjmwC6ffncdr0rqiZIyAVmpXk3pYkmAg/2IcE6V+0p7w2192MdAOhn6fGPBRP\nLx75jsXeFBDS1qWnrP9s3M/k\n-----END PRIVATE KEY-----\n", "client_email": "firebase-adminsdk-3pkkz@cellpack-data-582d6.iam.gserviceaccount.com", "client_id": "115795982306092928332", "auth_uri": "https://accounts.google.com/o/oauth2/auth", "token_uri": "https://oauth2.googleapis.com/token", "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs", "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/firebase-adminsdk-3pkkz%40cellpack-data-582d6.iam.gserviceaccount.com"}} \ No newline at end of file diff --git a/cellpack/autopack/Analysis.py b/cellpack/autopack/Analysis.py index 73f123e5f..333889d84 100644 --- a/cellpack/autopack/Analysis.py +++ b/cellpack/autopack/Analysis.py @@ -2217,8 +2217,13 @@ def pack_one_seed( """ seed_basename = f"seed_{seed_index}_{packing_basename}" self.env.result_file = str( - self.env.out_folder / f"results_seed_{seed_index}_{packing_basename}" + self.env.out_folder + / f"results_seed_{seed_index}_{packing_basename}" ) + # self.env.result_file = str( + # self.env.out_folder + # / f"results_{seed_basename}_{self.env.config_data['name']}_{self.env.version}" + # ) # Clear if self.afviewer: self.afviewer.clearFill("Test_Spheres2D") diff --git a/cellpack/autopack/Environment.py b/cellpack/autopack/Environment.py index 4acba624a..21c61542d 100644 --- a/cellpack/autopack/Environment.py +++ b/cellpack/autopack/Environment.py @@ -526,6 +526,9 @@ def save_result( save_grid_logs=False, save_result_as_file=False, ): + self.result_file = ( + f"{self.out_folder}/{self.name}_{self.config_data['name']}_{self.version}_seed_{seedNum}" + ) self.grid.free_points = free_points[:] self.grid.distToClosestSurf = distances[:] # should check extension filename for type of saved file