:wq

Merge branch 'development' of git.ourworld.tf:tfgrid/info_tfgrid into development

.gitignore

@@ -30,4 +30,5 @@ yarn.lock
 package-lock.json
 dist
 .temp
+filebrowser.db
 

collections/tfgridsimulation/specs/specs_nodes.md

@@ -3,7 +3,7 @@
 ## PLATINUM
 
 ```js
-!!tfgrid4_node.define
+!!tfgrid_simulator.node_define
     name:'platinum'
     cpu_brand:'amd'
     cpu_version:'9600'
@@ -23,7 +23,7 @@
     
 
 // Define the CloudBox
-!!tfgrid4_node.cloudbox_define
+!!tfgrid_simulator.cloudbox_define
     node:'platinum'
     amount:15
     description:''
@@ -35,7 +35,7 @@
     vcores:2
 
 // Define the StorageBox
-!!tfgrid4_node.storagebox_define
+!!tfgrid_simulator.storagebox_define
     node:'platinum'
     amount:100
     description:''
@@ -46,7 +46,7 @@
 ## AI
 
 ```js
-!!tfgrid4_node.define
+!!tfgrid_simulator.node_define
     name:'ai'
     cpu_brand:'amd'
     cpu_version:'9600'
@@ -65,7 +65,7 @@
     grant_max_nrnodes:1000 //max nr of nodes which will get this grant
         
 
-!!tfgrid4_node.aibox_define
+!!tfgrid_simulator.aibox_define
     node:'ai'
     amount:1
     gpu_brand:'Nvidia GeForce'
@@ -79,7 +79,7 @@
     storage_gb:1800
     vcores:24
 
-!!tfgrid4_node.storagebox_define
+!!tfgrid_simulator.storagebox_define
     node:'ai'
     amount:100
     description:''
@@ -90,7 +90,7 @@
 ## SILVER
 
 ```js
-!!tfgrid4_node.define
+!!tfgrid_simulator.node_define
     name:'silver'
     cpu_brand:'intel'
     cpu_version:'N96 12e gen'
@@ -110,7 +110,7 @@
     grant_max_nrnodes:5000 //max nr of nodes which will get this grant
         
 
-!!tfgrid4_node.cloudbox_define
+!!tfgrid_simulator.cloudbox_define
     node:'silver'
     amount:4
     description:''

collections/tfgridsimulation/specs/specs_rewards.md

@@ -3,7 +3,7 @@
 not used yet.
 
 ```js
-// !!tfgrid4_simulator.rewards_define
+// !!tfgrid_simulator.rewards_define
 //     inca_grant_new_user_usd:'1:20,12:0'
 //     inca_grant_new_user_inca:'1:20,12:0'
 //     inca_grant_month_usd:'1:20,12:0'

collections/tfgridsimulation/specs/specs_simulator.md

@@ -1,21 +1,21 @@
 ## growth simulation
 
 ```js
-!!tfgrid4_simulator.node_growth_define
+!!tfgrid_simulator.node_growth_define
     node_name:'silver'
     new_month:'0:20,30:5000'
     churn:2                     //in percent 0..100
     utilization:'0:0,20:70'     //in percent 0..100
     discount:'0:0,60:30'        //in percent 0..100
 
-!!tfgrid4_simulator.node_growth_define
+!!tfgrid_simulator.node_growth_define
     node_name:'platinum'
     new_month:'0:20,50:200'
     churn:2                     //in percent 0..100
     utilization:'0:0,20:70'     //in percent 0..100
     discount:'0:0,60:30'        //in percent 0..100
 
-!!tfgrid4_simulator.node_growth_define
+!!tfgrid_simulator.node_growth_define
     node_name:'ai'
     new_month:'0:20,30:100'
     churn:2                     //in percent 0..100
@@ -23,11 +23,11 @@
     discount:'0:0,60:30'        //in percent 0..100
 
 
-!!tfgrid4_simulator.incaprice_define
+!!tfgrid_simulator.incaprice_define
     incaprice_usd:'0:0.05,12:0.3,24:0.5,60:2'
 
 
-!!tfgrid4_simulator.run name:run1
+!!tfgrid_simulator.run name:'run1'
 
 
 

collections/tfgridsimulation_farming/.run.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+set -ex
+
+#~/code/github/freeflowuniverse/crystallib/cli/hero/compile_debug.sh
+
+hero mdbook -u https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/development/heroscript/tfgridsimulation_farming
+
+
+#result will be in /root/hero/var/mdbuild/tfgrid4simulator
+#~/hero/www/info/tfgrid4simulator/
+
+#https://threefold.info/tfgrid4simulator/

collections/tfgridsimulation_farming/SUMMARY.md

@@ -0,0 +1 @@
+../../heroscript/tfgridsimulation_farming/SUMMARY.md

collections/tfgridsimulation_farming/img/.done

@@ -0,0 +1 @@
+tf_intro.png

collections/tfgridsimulation_farming/intro.md

@@ -1,3 +1,11 @@
-![](img/cloud.png)
+![](img/tf_intro.png)
 
 ## Simulator for TFGrid 4.x
+
+
+This simulator has been created to allow people to experiment with the economic principles behind the TFGrid.
+
+In version 4 we changed the principles to make it easier to reach millions of nodes in the field.
+
+More information about threefold see: [https://www.threefold.io/host/](https://www.threefold.io/host/)
+

collections/tfgridsimulation_farming/nodes/node_1u.md

@@ -0,0 +1,5 @@
+
+
+
+
+!!!tfgridsimulation_farming.node_wiki name:'1u'

collections/tfgridsimulation_farming/nodes/node_example.md

@@ -1,4 +0,0 @@
-
-!!tfgridsimulation_farming.node_wiki name:...
-
-

collections/tfgridsimulation_farming/regionalinternet.md

@@ -0,0 +1,5 @@
+
+## Regional Internets
+
+
+!!!tfgridsimulation_farming.regionalinternet_wiki name:'znz'

collections/tfgridsimulation_farming/specs/nodes/node_1u_spec.md

@@ -4,14 +4,13 @@
 
 This is a normalized node for our simulator
 
-Following defines the Bill of Material and composition of such a noce
+Following defines the Bill of Material and composition of such a node
 
 ```js
 !!tfgridsimulation_farming.component_define name:AMD32 
     description: 'powerful amd cpu'
     cost:250.0    
-    //in watt
+    power:70 //in watt
-    power:70
     cru:32
 
 !!tfgridsimulation_farming.component_define name:CASE1U 
@@ -33,6 +32,7 @@ Following defines the Bill of Material and composition of such a noce
     sru:1000
 
 !!tfgridsimulation_farming.node_template_define name:'1U'
+    image:'projectinca:inca_node_silver_2.png'
 
 !!tfgridsimulation_farming.node_template_component_add name:'1U' nr:1 component:AMD32
 !!tfgridsimulation_farming.node_template_component_add name:'1U' nr:1 component:CASE1U

collections/tfgridsimulation_farming/specs/params.md

@@ -1,12 +0,0 @@
-
-## parameters for the simulation
-
-```js
-
-!!tfgridsimulation_farming.simulator_params_define	
-	wiki_path: '/tmp/simulatorwiki'
-
-
-```
-
-

collections/tfgridsimulation_farming/specs/params_cultivation.md

@@ -1,15 +1,15 @@
 
 ## cultivation parameters for the simulation
 
+
 ```js
 !!tfgridsimulation_farming.cultivation_params_define    
-    //how much in percentage are nodes used (0-100)
+    utilization_nodes: '1:0,24:70' //how much in percentage are nodes used (0-100)
-    utilization_nodes: '1:0,24:70'
+	revenue_per_cu_usd: '1:5,60:4' //revenue per cloud units
-	revenue_per_cu_usd: '1:5,60:4'
 	revenue_per_su_usd: '1:5,60:3'
 	revenue_per_nu_usd: '1:0.01,60:0.005'
-	cost_per_cu_usd: '1:0'
+	cost_per_cu_usd: '1:0' //is there a cost for the units, here no
 	cost_per_su_usd: '1:0'
-	cost_per_nu_usd: '1:0.005,60:0.0025'    
+	cost_per_nu_usd: '1:0.005,60:0.0025'   //for networking there is a cost
 
 ```

collections/tfgridsimulation_farming/specs/params_farming.md

@@ -5,7 +5,7 @@
 ```js
 !!tfgridsimulation_farming.environment_params_define
     //power cost per khw
-    power_cost: '1:0.06,60:0.15'
+    power_cost: '1:0.15,60:0.25'
     //rackspace cost per U in USD
     rackspace_cost: '1:10,60:5'
 

collections/tfgridsimulation_farming/specs/run.md

@@ -0,0 +1,13 @@
+
+## the runner
+
+This page triggers the full simulation
+
+```js
+
+!!tfgridsimulation_farming.run //this one will make sure the simulator is run
+
+
+```
+
+

collections/tfgridsimulation_farming/specs/specification.md

@@ -0,0 +1,7 @@
+![](img/tf_intro.png)
+
+# Specifications
+
+In this section you can change the paramters of a simulation.
+
+

heroscript/tfgridsimulation_farming/SUMMARY.md

@@ -1 +1,4 @@
 - [Introduction](tfgridsimulation_farming/intro.md)
+- [Specifications](tfgridsimulation_farming/specification.md)
+- [Node 1U](tfgridsimulation_farming/node_1u.md)
+- [regionalinternet.md](tfgridsimulation_farming/regionalinternet.md)

heroscript/tfgridsimulation_farming/run.md

@@ -2,7 +2,7 @@
 
 ```js
 
-!!book.generate name:'tfgrid4simulator' title:'TFGrid Simulator 4.0'
+!!book.generate name:'tfgridsimulation_farming' title:'TFGrid Simulator 4.0 - Farming'
         url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/development/heroscript/tfgridsimulation_farming'
 
 

heroscript/tfgridsimulation_farming/run.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -ex
 
-~/code/github/freeflowuniverse/crystallib/cli/hero/compile_debug.sh
+#~/code/github/freeflowuniverse/crystallib/cli/hero/compile_debug.sh
 
 hero mdbook -u https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/development/heroscript/tfgridsimulation_farming -o