DBO_random_data_generation__domain__CRI() mv + ;tweeking

2 files changed, 11 insertions, 5 deletions

diff --git a/src/local/domain/cri/domain_cri.py b/src/local/domain/cri/domain_cri.py
index c93b6473..75341ef7 100644
--- a/src/local/domain/cri/domain_cri.py
+++ b/src/local/domain/cri/domain_cri.py
@@ -2,15 +2,15 @@ from db_op import DB_op
 
 class DBO_random_data_generation__domain__CRI(DB_op):
 
-    def __init__(self, lim_n=128,
-                       lim_r=128 * 16,
-                       prob_link_create=0.25):
+    def __init__(self, lim_n=50,
+                       lim_r=10000,
+                       prob_link_create=0.01):
         """
         generate random data: CRI domain: Person x Skill
         """
         super(DBO_random_data_generation__domain__CRI, self).__init__()
 
-        n_attr_set__skill = ['Cryptocurrency',
+        n_attr_set__skill_raw = ['Cryptocurrency',
                              'Database architecture',
                              'Web-development',
                              'HTML',
@@ -19,6 +19,12 @@ class DBO_random_data_generation__domain__CRI(DB_op):
                              'Guitar Playing',
                              'Image processing']
 
+        n_attr_set__skill = []
+        for s in n_attr_set__skill_raw:
+            n_attr_set__skill.append(s)
+            n_attr_set__skill.append(s + '_a')
+            n_attr_set__skill.append(s + '_b')
+
         n_attr_set__name = ['Yael',
                             'Nofar',
                             'Ela',
diff --git a/src/server-tests/test_domain__CRI.py b/src/local/domain/cri/test_domain__CRI.py
index b76ecd0e..bacded97 100644
--- a/src/server-tests/test_domain__CRI.py
+++ b/src/local/domain/cri/test_domain__CRI.py
@@ -5,7 +5,7 @@ import unittest
 
 import db_controller as dbc
 from db_op import DBO_cypher_query
-from domain.cri.domain_cri import DBO_random_data_generation__domain__CRI
+from domain_cri import DBO_random_data_generation__domain__CRI
 from rz_server import Config