From e3bd75f3788fa28e69743128c0f147113676b51f Mon Sep 17 00:00:00 2001
From: D-X-Y <280835372@qq.com>
Date: Thu, 27 May 2021 13:09:14 +0000
Subject: [PATCH] Updates

---
 exps/GeMOSA/main.py | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/exps/GeMOSA/main.py b/exps/GeMOSA/main.py
index ac6ec23..3c8f802 100644
--- a/exps/GeMOSA/main.py
+++ b/exps/GeMOSA/main.py
@@ -272,19 +272,11 @@ def main(args):
     )
     logger.log("In this enviornment, the total loss-meter is {:}".format(loss_meter))
     """
-<<<<<<< HEAD
-    _, loss_adapt_v1, metric_adapt_v1 = online_evaluate(
-        test_env, meta_model, base_model, criterion, metric, args, logger, False, False
-    )
-    _, loss_adapt_v2, metric_adapt_v2 = online_evaluate(
-        test_env, meta_model, base_model, criterion, metric, args, logger, False, True
-=======
     w_containers_care_adapt, loss_adapt_v1, metric_adapt_v1 = online_evaluate(
-        valid_env, meta_model, base_model, criterion, metric, args, logger, True, False
+        test_env, meta_model, base_model, criterion, metric, args, logger, True, False
     )
     w_containers_easy_adapt, loss_adapt_v2, metric_adapt_v2 = online_evaluate(
-        valid_env, meta_model, base_model, criterion, metric, args, logger, True, True
->>>>>>> d4b846a9717279c08f1264398972c00aa949a69f
+        test_env, meta_model, base_model, criterion, metric, args, logger, True, True
     )
     logger.log(
         "[Refine-Adapt] loss = {:.6f}, metric = {:.6f}".format(