Adjustments for SF3k and SF10k

Author: szarnyasg

src/main/resources/scale_factors.xml

@@ -194,7 +194,7 @@
     <scale_factor name="3000" >
         <property>
             <name>generator.numPersons</name>
-            <value>10040000</value>
+            <value>6000000</value>
         </property>
         <property>
             <name>generator.startYear</name>
@@ -213,7 +213,7 @@
     <scale_factor name="10000" >
         <property>
             <name>generator.numPersons</name>
-            <value>30200000</value>
+            <value>20000000</value>
         </property>
         <property>
             <name>generator.startYear</name>

tools/emr/submit_datagen_job.py

@@ -23,7 +23,7 @@
     'use_spot': False,
     'master_instance_type': 'm5d.2xlarge',
     'instance_type': 'i3.4xlarge',
-    'sf_ratio': 50.0, # ratio of SFs and machines. a ratio of 50.0 for SF100 yields 2 machines
+    'sf_ratio': 100.0, # ratio of SFs and machines. a ratio of 50.0 for SF100 yields 2 machines
     'platform_version': lib.platform_version,
     'version': lib.version,
     'az': 'us-west-2c',