Merge pull request #7 from cnheider/develop

sanitize sanity
sintefneodroid · Oct 1, 2020 · ddb899a · ddb899a
2 parents 2abcdbe + 650952c
commit ddb899a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/neodroidagent/utilities/exploration/intrinsic_signals/torch_isp/curiosity/icm.py b/neodroidagent/utilities/exploration/intrinsic_signals/torch_isp/curiosity/icm.py
@@ -124,7 +124,7 @@ def __init__(
         signal_space: SignalSpace,
         policy_weight: float,
         weight: float,
-        intrinsic_reward_integration: float,
+        intrinsic_signal_factor: float,
         hidden_dim: int = 128,
     ):
         """
@@ -134,7 +134,7 @@ def __init__(
 :param signal_space: used for scaling the intrinsic reward returned by this module. Can be used to control how
 the fluctuation scale of the intrinsic signal
 :param weight: balances the importance between forward and inverse model
-:param intrinsic_reward_integration: balances the importance between extrinsic and intrinsic signal.
+:param intrinsic_signal_factor: balances the importance between extrinsic and intrinsic signal.
 """
 
         assert (
@@ -148,7 +148,7 @@ def __init__(
         self.policy_weight = policy_weight
         self.reward_scale = signal_space.span
         self.weight = weight
-        self.intrinsic_signal_integration = intrinsic_reward_integration
+        self.intrinsic_signal_factor = intrinsic_signal_factor
 
         self.encoder = nn.Sequential(
             nn.Linear(observation_space.shape[0], hidden_dim),
@@ -233,8 +233,8 @@ def sample(
             writer.scalar("icm/signal", intrinsic_signal.mean().item())
 
         return (
-            1.0 - self.intrinsic_signal_integration
-        ) * signals + self.intrinsic_signal_integration * intrinsic_signal
+            1.0 - self.intrinsic_signal_factor
+        ) * signals + self.intrinsic_signal_factor * intrinsic_signal
 
     def loss(
         self,

diff --git a/tests/test_sanity.py b/tests/test_sanity.py
@@ -5,7 +5,10 @@
 import pytest
 
 __author__ = "Christian Heider Nielsen"
+__doc__ = r"""
 
+           Created on 01/08/2020
+           """
 
 def test_sanity():
     assert True
@@ -21,7 +24,7 @@ def test_print(capsys):
     print(text)
     sys.stderr.write("world")
     captured = capsys.readouterr()
-    assert text in captured.head
+    assert text in captured.out
     assert err in captured.err