diff --git a/.gitignore b/.gitignore index c9db6e1..26714c2 100644 --- a/.gitignore +++ b/.gitignore @@ -30,4 +30,5 @@ yarn.lock package-lock.json dist .temp +filebrowser.db diff --git a/collections/about/about.md b/collections/about/about.md index 9e981f4..e525d0e 100644 --- a/collections/about/about.md +++ b/collections/about/about.md @@ -10,4 +10,4 @@ It's a good place to start if you want to have an overview of ThreeFold since it - [ThreeFold Tech](threefold_tech.md) - [Organisation Structure](orgstructure.md) - [ThreeFold Roadmap](roadmap_readme.md) -- [ThreeFold Token](token_overview.md) \ No newline at end of file +- [ThreeFold Token](token_overview.md) diff --git a/collections/tfgridsimulation/specs/specs_nodes.md b/collections/tfgridsimulation/specs/specs_nodes.md index b1caadf..cc22fc3 100644 --- a/collections/tfgridsimulation/specs/specs_nodes.md +++ b/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:'' diff --git a/collections/tfgridsimulation/specs/specs_rewards.md b/collections/tfgridsimulation/specs/specs_rewards.md index 144f501..e6702ea 100644 --- a/collections/tfgridsimulation/specs/specs_rewards.md +++ b/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' diff --git a/collections/tfgridsimulation/specs/specs_simulator.md b/collections/tfgridsimulation/specs/specs_simulator.md index a28c1a5..024653c 100644 --- a/collections/tfgridsimulation/specs/specs_simulator.md +++ b/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' diff --git a/collections/tfgridsimulation_farming/.run.sh b/collections/tfgridsimulation_farming/.run.sh new file mode 100755 index 0000000..223c48f --- /dev/null +++ b/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/ \ No newline at end of file diff --git a/collections/tfgridsimulation_farming/SUMMARY.md b/collections/tfgridsimulation_farming/SUMMARY.md new file mode 120000 index 0000000..bfd9d1d --- /dev/null +++ b/collections/tfgridsimulation_farming/SUMMARY.md @@ -0,0 +1 @@ +../../heroscript/tfgridsimulation_farming/SUMMARY.md \ No newline at end of file diff --git a/collections/tfgridsimulation_farming/img/.done b/collections/tfgridsimulation_farming/img/.done new file mode 100644 index 0000000..ccef3d2 --- /dev/null +++ b/collections/tfgridsimulation_farming/img/.done @@ -0,0 +1 @@ +tf_intro.png diff --git a/collections/tfgridsimulation_farming/img/tf_intro.png b/collections/tfgridsimulation_farming/img/tf_intro.png new file mode 100644 index 0000000..a0c87a8 Binary files /dev/null and b/collections/tfgridsimulation_farming/img/tf_intro.png differ diff --git a/collections/tfgridsimulation_farming/intro.md b/collections/tfgridsimulation_farming/intro.md index 804070e..4f858ba 100644 --- a/collections/tfgridsimulation_farming/intro.md +++ b/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/) + diff --git a/collections/tfgridsimulation_farming/nodes/node_1u.md b/collections/tfgridsimulation_farming/nodes/node_1u.md new file mode 100644 index 0000000..039bc2f --- /dev/null +++ b/collections/tfgridsimulation_farming/nodes/node_1u.md @@ -0,0 +1,5 @@ + + + + +!!!tfgridsimulation_farming.node_wiki name:'1u' diff --git a/collections/tfgridsimulation_farming/nodes/node_example.md b/collections/tfgridsimulation_farming/nodes/node_example.md deleted file mode 100644 index 8c8d4bf..0000000 --- a/collections/tfgridsimulation_farming/nodes/node_example.md +++ /dev/null @@ -1,4 +0,0 @@ - -!!tfgridsimulation_farming.node_wiki name:... - - diff --git a/collections/tfgridsimulation_farming/regionalinternet.md b/collections/tfgridsimulation_farming/regionalinternet.md new file mode 100644 index 0000000..b052d24 --- /dev/null +++ b/collections/tfgridsimulation_farming/regionalinternet.md @@ -0,0 +1,5 @@ + +## Regional Internets + + +!!!tfgridsimulation_farming.regionalinternet_wiki name:'znz' \ No newline at end of file diff --git a/collections/tfgridsimulation_farming/specs/params_node_template.md b/collections/tfgridsimulation_farming/specs/nodes/node_1u_spec.md similarity index 91% rename from collections/tfgridsimulation_farming/specs/params_node_template.md rename to collections/tfgridsimulation_farming/specs/nodes/node_1u_spec.md index 7d05a7e..1077694 100644 --- a/collections/tfgridsimulation_farming/specs/params_node_template.md +++ b/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 + cost:250.0 + power:70 //in watt 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 diff --git a/collections/tfgridsimulation_farming/specs/params.md b/collections/tfgridsimulation_farming/specs/params.md deleted file mode 100644 index f64ecbd..0000000 --- a/collections/tfgridsimulation_farming/specs/params.md +++ /dev/null @@ -1,12 +0,0 @@ - -## parameters for the simulation - -```js - -!!tfgridsimulation_farming.simulator_params_define - wiki_path: '/tmp/simulatorwiki' - - -``` - - diff --git a/collections/tfgridsimulation_farming/specs/params_cultivation.md b/collections/tfgridsimulation_farming/specs/params_cultivation.md index 8149a47..fd6ddc2 100644 --- a/collections/tfgridsimulation_farming/specs/params_cultivation.md +++ b/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' - revenue_per_cu_usd: '1:5,60:4' +!!tfgridsimulation_farming.cultivation_params_define + utilization_nodes: '1:0,24:70' //how much in percentage are nodes used (0-100) + revenue_per_cu_usd: '1:5,60:4' //revenue per cloud units 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 -``` \ No newline at end of file +``` diff --git a/collections/tfgridsimulation_farming/specs/params_farming.md b/collections/tfgridsimulation_farming/specs/params_farming.md index 2ac60f8..72a9f5c 100644 --- a/collections/tfgridsimulation_farming/specs/params_farming.md +++ b/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' diff --git a/collections/tfgridsimulation_farming/specs/run.md b/collections/tfgridsimulation_farming/specs/run.md new file mode 100644 index 0000000..5961633 --- /dev/null +++ b/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 + + +``` + + diff --git a/collections/tfgridsimulation_farming/specs/specification.md b/collections/tfgridsimulation_farming/specs/specification.md new file mode 100644 index 0000000..22f86b6 --- /dev/null +++ b/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. + + diff --git a/collections/why/countries_no_internet.md b/collections/why/countries_no_internet.md index 6dc569a..56b2cca 100644 --- a/collections/why/countries_no_internet.md +++ b/collections/why/countries_no_internet.md @@ -12,4 +12,4 @@ It is a must to democratize the Internet. Some companies have access to the data of hundreds of millions of citizens, this makes us a product. -![alt text](not_internet_losses.png) \ No newline at end of file +![alt text](not_internet_losses.png) diff --git a/heroscript/tfgridsimulation_farming/SUMMARY.md b/heroscript/tfgridsimulation_farming/SUMMARY.md index f6eafb8..9e70d97 100644 --- a/heroscript/tfgridsimulation_farming/SUMMARY.md +++ b/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) \ No newline at end of file diff --git a/heroscript/tfgridsimulation_farming/run.md b/heroscript/tfgridsimulation_farming/run.md index d8d48f9..082fe1a 100644 --- a/heroscript/tfgridsimulation_farming/run.md +++ b/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' diff --git a/heroscript/tfgridsimulation_farming/run.sh b/heroscript/tfgridsimulation_farming/run.sh index fab6b02..e17e85e 100755 --- a/heroscript/tfgridsimulation_farming/run.sh +++ b/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