From 391ce5e9e0d9cce91a019488b1c9ac4826f6c107 Mon Sep 17 00:00:00 2001
From: Tasio Mendez <tm.tasio@gmail.com>
Date: Fri, 21 Apr 2017 14:19:26 +0200
Subject: [PATCH] Changed models

---
 models/BigMarketModel/__init__.py                 | 1 -
 models/{BigMarketModel => SISaModel}/SISaModel.py | 2 +-
 models/SISaModel/__init__.py                      | 1 +
 models/__init__.py                                | 2 +-
 soil.py                                           | 3 +--
 5 files changed, 4 insertions(+), 5 deletions(-)
 rename models/{BigMarketModel => SISaModel}/SISaModel.py (99%)
 create mode 100644 models/SISaModel/__init__.py

diff --git a/models/BigMarketModel/__init__.py b/models/BigMarketModel/__init__.py
index 82169f5..311c7cd 100644
--- a/models/BigMarketModel/__init__.py
+++ b/models/BigMarketModel/__init__.py
@@ -1,2 +1 @@
 from .BigMarketModel import BigMarketModel
-from .SISaModel import SISaModel
diff --git a/models/BigMarketModel/SISaModel.py b/models/SISaModel/SISaModel.py
similarity index 99%
rename from models/BigMarketModel/SISaModel.py
rename to models/SISaModel/SISaModel.py
index e432c02..6fd78a0 100644
--- a/models/BigMarketModel/SISaModel.py
+++ b/models/SISaModel/SISaModel.py
@@ -1,6 +1,6 @@
 import random
 import numpy as np
-from ..BaseBehaviour import *
+from models.BaseBehaviour import *
 
 
 class SISaModel(BaseBehaviour):
diff --git a/models/SISaModel/__init__.py b/models/SISaModel/__init__.py
new file mode 100644
index 0000000..bb381a3
--- /dev/null
+++ b/models/SISaModel/__init__.py
@@ -0,0 +1 @@
+from .SISaModel import SISaModel
diff --git a/models/__init__.py b/models/__init__.py
index ac9a29c..557d8fc 100644
--- a/models/__init__.py
+++ b/models/__init__.py
@@ -5,4 +5,4 @@ from .BigMarketModel import *
 from .IndependentCascadeModel import *
 from .ModelM2 import *
 from .SentimentCorrelationModel import *
-
+from .SISaModel import *
diff --git a/soil.py b/soil.py
index 0f983c3..5a8ec4c 100644
--- a/soil.py
+++ b/soil.py
@@ -27,8 +27,7 @@ if settings.network_type == 2:
 ##############
 
 sim = NetworkSimulation(topology=G, states=init_states, agent_type=ControlModelM2,
-                        max_time=settings.max_time, num_trials=settings.num_trials, logging_interval=1.0,
-                        environment_params=settings)
+                        max_time=settings.max_time, num_trials=settings.num_trials, logging_interval=1.0)
 
 sim.run_simulation()