fix merge conflict

convlab/agent/__init__.py

@@ -1,3 +1,6 @@
+# Modified by Microsoft Corporation.
+# Licensed under the MIT license.
+
 # The agent module
 import numpy as np
 import pandas as pd

convlab/agent/algorithm/policy_util.py

@@ -1,5 +1,6 @@
 # Modified by Microsoft Corporation.
 # Licensed under the MIT license.
+
 # Action policy module
 # Constructs action probability distribution used by agent to sample action and calculate log_prob, entropy, etc.
 from gym import spaces

convlab/agent/algorithm/ppo.py

@@ -1,3 +1,6 @@
+# Modified by Microsoft Corporation.
+# Licensed under the MIT license.
+
 from copy import deepcopy
 from convlab.agent import net
 from convlab.agent.algorithm import policy_util

convlab/agent/algorithm/random.py

@@ -1,3 +1,6 @@
+# Modified by Microsoft Corporation.
+# Licensed under the MIT license.
+
 # The random agent algorithm
 # For basic dev purpose
 from convlab.agent.algorithm.base import Algorithm

convlab/agent/algorithm/reinforce.py

@@ -1,3 +1,6 @@
+# Modified by Microsoft Corporation.
+# Licensed under the MIT license.
+
 from convlab.agent import net
 from convlab.agent.algorithm import policy_util
 from convlab.agent.algorithm.base import Algorithm

convlab/agent/algorithm/sarsa.py

@@ -1,3 +1,6 @@
+# Modified by Microsoft Corporation.
+# Licensed under the MIT license.
+
 from convlab.agent import net
 from convlab.agent.algorithm import policy_util
 from convlab.agent.algorithm.base import Algorithm

convlab/agent/algorithm/sil.py

@@ -1,3 +1,6 @@
+# Modified by Microsoft Corporation.
+# Licensed under the MIT license.
+
 from convlab.agent import net, memory
 from convlab.agent.algorithm import policy_util
 from convlab.agent.algorithm.actor_critic import ActorCritic

convlab/agent/memory/base.py

@@ -1,3 +1,6 @@
+# Modified by Microsoft Corporation.
+# Licensed under the MIT license.
+
 from abc import ABC, abstractmethod
 from collections import deque
 from convlab.lib import logger, util

convlab/agent/memory/onpolicy.py

@@ -1,3 +1,6 @@
+# Modified by Microsoft Corporation.
+# Licensed under the MIT license.
+
 from collections import deque
 from copy import deepcopy
 from convlab.agent.memory.base import Memory

convlab/agent/memory/prioritized.py

@@ -1,3 +1,6 @@
+# Modified by Microsoft Corporation.
+# Licensed under the MIT license.
+
 from convlab.agent.memory.replay import Replay
 from convlab.lib import util
 from convlab.lib.decorator import lab_api

convlab/agent/memory/replay.py

@@ -1,3 +1,6 @@
+# Modified by Microsoft Corporation.
+# Licensed under the MIT license.
+
 from collections import deque
 from copy import deepcopy
 from convlab.agent.memory.base import Memory

convlab/agent/net/base.py

@@ -1,3 +1,6 @@
+# Modified by Microsoft Corporation.
+# Licensed under the MIT license.
+
 from abc import ABC, abstractmethod
 from convlab.agent.net import net_util
 import pydash as ps

convlab/agent/net/conv.py

@@ -1,3 +1,6 @@
+# Modified by Microsoft Corporation.
+# Licensed under the MIT license.
+
 from convlab.agent.net import net_util
 from convlab.agent.net.base import Net
 from convlab.lib import math_util, util

convlab/agent/net/mlp.py

@@ -1,3 +1,6 @@
+# Modified by Microsoft Corporation.
+# Licensed under the MIT license.
+
 from convlab.agent.net import net_util
 from convlab.agent.net.base import Net
 from convlab.lib import math_util, util

convlab/agent/net/net_util.py

@@ -1,3 +1,6 @@
+# Modified by Microsoft Corporation.
+# Licensed under the MIT license.
+
 from functools import partial, wraps
 from convlab.lib import logger, optimizer, util
 import os

convlab/agent/net/recurrent.py

@@ -1,3 +1,6 @@
+# Modified by Microsoft Corporation.
+# Licensed under the MIT license.
+
 from convlab.agent.net import net_util
 from convlab.agent.net.base import Net
 from convlab.lib import util

convlab/env/base.py

@@ -1,3 +1,6 @@
+# Modified by Microsoft Corporation.
+# Licensed under the MIT license.
+
 from abc import ABC, abstractmethod
 from gym import spaces
 from convlab.lib import logger, util

convlab/env/movie.py

@@ -1,4 +1,4 @@
-# Modified by Microsoft Corporation.
+# Copyright (c) Microsoft Corporation.
 # Licensed under the MIT license.
 
 import io

convlab/env/multiwoz.py

@@ -1,4 +1,4 @@
-# Modified by Microsoft Corporation.
+# Copyright (c) Microsoft Corporation.
 # Licensed under the MIT license.
 
 from copy import deepcopy

convlab/experiment/__init__.py

@@ -1,2 +1,5 @@
+# Modified by Microsoft Corporation.
+# Licensed under the MIT license.
+
 # The experiment module
 # Handles experimentation logic: control, analysis

convlab/experiment/analysis.py

@@ -1,3 +1,6 @@
+# Modified by Microsoft Corporation.
+# Licensed under the MIT license.
+
 from convlab.lib import logger, util, viz
 from convlab.spec import random_baseline
 import numpy as np

convlab/experiment/control.py

@@ -1,3 +1,6 @@
+# Modified by Microsoft Corporation.
+# Licensed under the MIT license.
+
 # The control module
 # Creates and runs control loops at levels: Experiment, Trial, Session
 from copy import deepcopy

convlab/experiment/retro_analysis.py

@@ -1,3 +1,6 @@
+# Modified by Microsoft Corporation.
+# Licensed under the MIT license.
+
 # The retro analysis module
 # Runs analysis post-hoc using existing data files
 # example: yarn retro_analyze data/reinforce_cartpole_2018_01_22_211751/

convlab/experiment/search.py

@@ -1,3 +1,6 @@
+# Modified by Microsoft Corporation.
+# Licensed under the MIT license.
+
 from copy import deepcopy
 from convlab.lib import logger, util
 import numpy as np

convlab/lib/__init__.py

@@ -0,0 +1,2 @@
+# Modified by Microsoft Corporation.
+# Licensed under the MIT license.

convlab/lib/decorator.py

@@ -1,3 +1,6 @@
+# Modified by Microsoft Corporation.
+# Licensed under the MIT license.
+
 from functools import wraps
 from convlab.lib import logger
 import time

convlab/lib/distribution.py

@@ -1,3 +1,6 @@
+# Modified by Microsoft Corporation.
+# Licensed under the MIT license.
+
 # Custom PyTorch distribution classes to be registered in policy_util.py
 # Mainly used by policy_util action distribution
 from torch import distributions

convlab/lib/file_util.py

@@ -1,5 +1,6 @@
-# Modified by Microsoft Corporation.
+# Copyright (c) Microsoft Corporation.
 # Licensed under the MIT license.
+
 from pathlib import Path
 
 from allennlp.common.file_utils import cached_path as allennlp_cached_path

convlab/lib/logger.py

@@ -1,3 +1,6 @@
+# Modified by Microsoft Corporation.
+# Licensed under the MIT license.
+
 import colorlog
 import logging
 import os

convlab/lib/math_util.py

@@ -1,3 +1,6 @@
+# Modified by Microsoft Corporation.
+# Licensed under the MIT license.
+
 # Various math calculations used by algorithms
 import numpy as np
 import torch

convlab/lib/optimizer.py

@@ -1,3 +1,6 @@
+# Modified by Microsoft Corporation.
+# Licensed under the MIT license.
+
 # Custom PyTorch optimizer classes, to be registered in net_util.py
 import math
 import torch

convlab/lib/util.py

@@ -1,3 +1,6 @@
+# Modified by Microsoft Corporation.
+# Licensed under the MIT license.
+
 from collections import deque
 from contextlib import contextmanager
 from datetime import datetime

convlab/lib/viz.py

@@ -1,3 +1,6 @@
+# Modified by Microsoft Corporation.
+# Licensed under the MIT license.
+
 # The data visualization module
 # Defines plotting methods for analysis
 from plotly import graph_objs as go, io as pio, tools

convlab/modules/policy/system/multiwoz/util.py

@@ -248,7 +248,6 @@ def get_info_state(belief_state):
  booking.append(0)
  else:
  if belief_state[domain]['book'][slot] != "":
- print("domain {} booking set".format(domain))
  booking.append(1)
  else:
  booking.append(0)

convlab/modules/state_encoder/multiwoz/multiwoz_state_encoder.py

@@ -92,7 +92,6 @@ def get_info_state(self, belief_state):
  booking.append(0)
  else:
  if belief_state[domain]['book'][slot] != "":
- print("domain {} booking set".format(domain))
  booking.append(1)
  else:
  booking.append(0)

convlab/modules/word_policy/multiwoz/mdrg/predict.py

@@ -249,7 +249,6 @@ def get_summary_bstate(bstate):
  booking.append(0)
  else:
  if bstate[domain]['book'][slot] != "":
- print("domain {} booking set".format(domain))
  booking.append(1)
  else:
  booking.append(0)