diff --git a/CanvasApp/FloatingSpace/FloatingObject.js b/CanvasApp/FloatingSpace/FloatingObject.js index b84f43764..bc83446dd 100644 --- a/CanvasApp/FloatingSpace/FloatingObject.js +++ b/CanvasApp/FloatingSpace/FloatingObject.js @@ -330,7 +330,7 @@ function newFloatingObject () { thisObject.payload.distance = distanceToParent - if (distanceToParent > 2000) { return } // this is introduced to avoid edges cases when importing workspaces. + if (distanceToParent > 2000 || thisObject.isPinned === true) { return } // this is introduced to avoid edges cases when importing workspaces. newPosition = { x: parent.payload.position.x + distanceToParent * Math.cos(toRadians(thisObject.payload.angle)), diff --git a/CanvasApp/FloatingSpace/UiObject.js b/CanvasApp/FloatingSpace/UiObject.js index d33a094cb..daa0022bf 100644 --- a/CanvasApp/FloatingSpace/UiObject.js +++ b/CanvasApp/FloatingSpace/UiObject.js @@ -1321,7 +1321,7 @@ function newUiObject () { browserCanvasContext.beginPath() browserCanvasContext.arc(visiblePosition.x, visiblePosition.y, VISIBLE_RADIUS, 0, Math.PI * 2, true) browserCanvasContext.closePath() - browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.LIGHT_GREY + ', ' + OPACITY + ')' + browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.GOLDEN_ORANGE + ', ' + OPACITY + ')' browserCanvasContext.lineWidth = 10 browserCanvasContext.setLineDash([10, 90]) browserCanvasContext.stroke() @@ -1329,7 +1329,7 @@ function newUiObject () { browserCanvasContext.beginPath() browserCanvasContext.arc(visiblePosition.x, visiblePosition.y, VISIBLE_RADIUS, 0, Math.PI * 2, true) browserCanvasContext.closePath() - browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.LIGHT_GREY + ', ' + OPACITY + ')' + browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.GOLDEN_ORANGE + ', ' + OPACITY + ')' browserCanvasContext.lineWidth = 5 browserCanvasContext.setLineDash([5, 45]) browserCanvasContext.stroke() @@ -1337,7 +1337,7 @@ function newUiObject () { browserCanvasContext.beginPath() browserCanvasContext.arc(visiblePosition.x, visiblePosition.y, VISIBLE_RADIUS, 0, Math.PI * 2, true) browserCanvasContext.closePath() - browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.LIGHT_GREY + ', ' + OPACITY + ')' + browserCanvasContext.strokeStyle = 'rgba(' + UI_COLOR.GOLDEN_ORANGE + ', ' + OPACITY + ')' browserCanvasContext.lineWidth = 1 browserCanvasContext.setLineDash([2, 8]) browserCanvasContext.stroke() @@ -1370,7 +1370,7 @@ function newUiObject () { if (icon !== undefined) { if (icon.canDrawIcon === true) { let additionalImageSize = 0 - if (thisObject.isExecuting === true) { additionalImageSize = 20 } + if (thisObject.isExecuting === true || isReadyToReferenceAttach === true || isReadyToChainAttach === true) { additionalImageSize = 20 } let totalImageSize = additionalImageSize + thisObject.payload.floatingObject.currentImageSize browserCanvasContext.drawImage( diff --git a/Legacy-Code/AAMasters/bots/AABruce-Indicator-Bot/Single-Period-Daily/User.Bot.js b/Legacy-Code/AAMasters/bots/AABruce-Indicator-Bot/Single-Period-Daily/User.Bot.js index 3c2031fe5..d42c7a3b7 100644 --- a/Legacy-Code/AAMasters/bots/AABruce-Indicator-Bot/Single-Period-Daily/User.Bot.js +++ b/Legacy-Code/AAMasters/bots/AABruce-Indicator-Bot/Single-Period-Daily/User.Bot.js @@ -56,7 +56,7 @@ let market = bot.market; - let lastHoleFixedFile; // Datetime of the last file certified by the Hole Fixing process as without permanent holes. + let lastTradeFileAvailable; // Datetime of the last file certified by the Hole Fixing process as without permanent holes. let firstTradeFile; // Datetime of the first trade file in the whole market history. let lastTradeFileSaved; // Datetime of the last verified file without holes. let lastCandleClose; // Value of the last candle close. @@ -118,12 +118,12 @@ logger.write(MODULE_NAME, "[WARN] start -> getContextVariables -> Undefined Last File. -> reportKey = " + reportKey); logger.write(MODULE_NAME, "[HINT] start -> getContextVariables -> If the status report does not exist we will point the lasCandleFile to the last day of the previous month."); - lastHoleFixedFile = new Date(processDate.valueOf() - ONE_DAY_IN_MILISECONDS); + lastTradeFileAvailable = new Date(processDate.valueOf() - ONE_DAY_IN_MILISECONDS); findLastCandleCloseValue(); return; } - lastHoleFixedFile = new Date(thisReport.lastTradeFile.year + "-" + thisReport.lastTradeFile.month + "-" + thisReport.lastTradeFile.days + " " + "00:00" + GMT_SECONDS); + lastTradeFileAvailable = new Date(thisReport.lastTradeFile.year + "-" + thisReport.lastTradeFile.month + "-" + thisReport.lastTradeFile.days + " " + "00:00" + GMT_SECONDS); lastCandleClose = thisReport.candleClose; if (thisReport.fileComplete === true) { @@ -161,7 +161,7 @@ if (FULL_LOG === true) { logger.write(MODULE_NAME, "[INFO] start -> findPreviousContent -> getCandles -> Entering function."); } let fileName = '' + market.baseAsset + '_' + market.quotedAsset + '.json'; - let dateForPath = lastHoleFixedFile.getUTCFullYear() + '/' + utilities.pad(lastHoleFixedFile.getUTCMonth() + 1, 2) + '/' + utilities.pad(lastHoleFixedFile.getUTCDate(), 2); + let dateForPath = lastTradeFileAvailable.getUTCFullYear() + '/' + utilities.pad(lastTradeFileAvailable.getUTCMonth() + 1, 2) + '/' + utilities.pad(lastTradeFileAvailable.getUTCDate(), 2); let filePath = bot.filePathRoot + "/Output/" + CANDLES_FOLDER_NAME + '/' + CANDLES_ONE_MIN + '/' + dateForPath; filePath += '/' + fileName @@ -212,7 +212,7 @@ if (FULL_LOG === true) { logger.write(MODULE_NAME, "[INFO] start -> findPreviousContent -> getVolumes -> Entering function."); } let fileName = '' + market.baseAsset + '_' + market.quotedAsset + '.json'; - let dateForPath = lastHoleFixedFile.getUTCFullYear() + '/' + utilities.pad(lastHoleFixedFile.getUTCMonth() + 1, 2) + '/' + utilities.pad(lastHoleFixedFile.getUTCDate(), 2); + let dateForPath = lastTradeFileAvailable.getUTCFullYear() + '/' + utilities.pad(lastTradeFileAvailable.getUTCMonth() + 1, 2) + '/' + utilities.pad(lastTradeFileAvailable.getUTCDate(), 2); let filePath = bot.filePathRoot + "/Output/" + VOLUMES_FOLDER_NAME + '/' + VOLUMES_ONE_MIN + '/' + dateForPath; filePath += '/' + fileName @@ -241,7 +241,7 @@ volumesFile = JSON.parse(text); previousVolumes = volumesFile; - lastHoleFixedFile = new Date(lastHoleFixedFile.valueOf() - ONE_DAY_IN_MILISECONDS); // We know that after the next call a new day will be added. + lastTradeFileAvailable = new Date(lastTradeFileAvailable.valueOf() - ONE_DAY_IN_MILISECONDS); // We know that after the next call a new day will be added. buildCandlesAndVolumes(previousCandles, previousVolumes); } catch (err) { @@ -287,8 +287,8 @@ if (FULL_LOG === true) { logger.write(MODULE_NAME, "[INFO] start -> findPreviousContent -> Entering market = " + JSON.stringify(market)); } if (FULL_LOG === true) { logger.write(MODULE_NAME, "[INFO] start -> findPreviousContent -> lastCandleClose = " + lastCandleClose); } - lastHoleFixedFile = new Date(firstTradeFile.getUTCFullYear() + "-" + (firstTradeFile.getUTCMonth() + 1) + "-" + firstTradeFile.getUTCDate() + " " + "00:00" + GMT_SECONDS); - lastHoleFixedFile = new Date(lastHoleFixedFile.valueOf() - ONE_DAY_IN_MILISECONDS); + lastTradeFileAvailable = new Date(firstTradeFile.getUTCFullYear() + "-" + (firstTradeFile.getUTCMonth() + 1) + "-" + firstTradeFile.getUTCDate() + " " + "00:00" + GMT_SECONDS); + lastTradeFileAvailable = new Date(lastTradeFileAvailable.valueOf() - ONE_DAY_IN_MILISECONDS); lastCandleClose = 0; buildCandlesAndVolumes(); @@ -412,9 +412,9 @@ if (FULL_LOG === true) { logger.write(MODULE_NAME, "[INFO] start -> buildCandlesAndVolumes -> nextFile -> Entering function."); } - lastHoleFixedFile = new Date(lastHoleFixedFile.valueOf() + ONE_DAY_IN_MILISECONDS); + lastTradeFileAvailable = new Date(lastTradeFileAvailable.valueOf() + ONE_DAY_IN_MILISECONDS); - let date = new Date(lastHoleFixedFile.valueOf() - 60 * 1000); + let date = new Date(lastTradeFileAvailable.valueOf() - 60 * 1000); if (date.valueOf() < firstTradeFile.valueOf()) { // At the special case where we are at the begining of the market, this might be true. date = new Date(firstTradeFile.valueOf() - 60 * 1000); @@ -481,9 +481,9 @@ /* Check if we are outside the current Day / File */ - if (date.getUTCDate() !== lastHoleFixedFile.getUTCDate()) { + if (date.getUTCDate() !== lastTradeFileAvailable.getUTCDate()) { - writeFiles(lastHoleFixedFile, candles, volumes, true, onFilesWritten); + writeFiles(lastTradeFileAvailable, candles, volumes, true, onFilesWritten); return; @@ -497,7 +497,7 @@ if (date.valueOf() > lastTradeFileSaved.valueOf()) { - writeFiles(lastHoleFixedFile, candles, volumes, false, onFilesWritten); + writeFiles(lastTradeFileAvailable, candles, volumes, false, onFilesWritten); return; function onFilesWritten() { diff --git a/WebServer/Images/Icons/style-01/angle-to-parent-000.png b/WebServer/Images/Icons/style-01/angle-to-parent-000.png index 08de6ae0f..3d4ab2c42 100644 Binary files a/WebServer/Images/Icons/style-01/angle-to-parent-000.png and b/WebServer/Images/Icons/style-01/angle-to-parent-000.png differ diff --git a/WebServer/Images/Icons/style-01/distance-to-parent-000.png b/WebServer/Images/Icons/style-01/distance-to-parent-000.png index 4a4e8b578..349eb1493 100644 Binary files a/WebServer/Images/Icons/style-01/distance-to-parent-000.png and b/WebServer/Images/Icons/style-01/distance-to-parent-000.png differ diff --git a/WebServer/Images/Icons/style-01/next-phase-event (2).png b/WebServer/Images/Icons/style-01/next-phase-event (2).png new file mode 100644 index 000000000..d84bdd965 Binary files /dev/null and b/WebServer/Images/Icons/style-01/next-phase-event (2).png differ diff --git a/WebServer/Images/Icons/style-01/next-phase-event.png b/WebServer/Images/Icons/style-01/next-phase-event.png index 7f958daf5..0ba901030 100644 Binary files a/WebServer/Images/Icons/style-01/next-phase-event.png and b/WebServer/Images/Icons/style-01/next-phase-event.png differ diff --git a/WebServer/Images/Icons/style-01/task-manager.png b/WebServer/Images/Icons/style-01/task-manager.png index 109d16159..1dbb5fd4e 100644 Binary files a/WebServer/Images/Icons/style-01/task-manager.png and b/WebServer/Images/Icons/style-01/task-manager.png differ diff --git a/docs/_config.yml b/docs/_config.yml index a198aa663..279c25b6f 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -56,6 +56,7 @@ kramdown: auto_ids: true hard_wrap: false syntax_highlighter: rouge + parse_block_html: true # filter used to process markdown. note that kramdown differs from github-flavored markdown in some subtle ways diff --git a/docs/_includes/toc.html b/docs/_includes/toc.html index 067141a6a..289e2887a 100644 --- a/docs/_includes/toc.html +++ b/docs/_includes/toc.html @@ -4,7 +4,7 @@ $( document ).ready(function() { // Handler for .ready() called. -$('#toc').toc({ minimumHeaders: 0, listType: 'ul', showSpeed: 0, headers: 'h2,h3,h4' }); +$('#toc').toc({ minimumHeaders: 0, listType: 'ul', showSpeed: 0, headers: 'h2,h3' }); /* this offset helps account for the space taken up by the floating toolbar. */ $('#toc').on('click', 'a', function() { diff --git a/docs/_includes/trading_system/base-asset.md b/docs/_includes/trading_system/base-asset.md index 669fb7347..618029a1b 100644 --- a/docs/_includes/trading_system/base-asset.md +++ b/docs/_includes/trading_system/base-asset.md @@ -3,6 +3,7 @@ {% assign title = "Base Asset" %} {% assign definition = site.data.trading_system.base_asset %} {% assign preposition = "a" %} +{% assign plural = "s" %} @@ -12,19 +13,19 @@ {% if include.icon != "no" %} -{% if include.table == "y" %} +{% if include.table == "yes" and include.icon != "no" %}
{% endif %} -{% if include.table == "y" %} +{% if include.table == "yes" and include.icon != "no" %} {% endif %} {% endif %} -{% if include.definition != "regular" %} +{% if include.definition == "bold" %} {{ definition }} @@ -34,25 +35,35 @@ {% endif %} -{% if include.table == "y" and include.icon != "no" %} +{% if include.table == "yes" and include.icon != "no" %}
{% endif %} -{% if include.content != "n" %} +{% if include.more == "yes" and include.content == "more" %} +
Click to learn more about {{ title | downcase }}{{plural}} + +{% endif %} + +{% if include.content != "no" %} The basse asset must reference an asset in a specific market of a specific exchange in the Crypto Ecosystem hierarchy. - + {% endif %} +{% if include.more == "yes" and include.content != "more" %} +
Click to learn more about {{ title | downcase }}{{plural}} + +{% endif %} + {% if include.adding != "" %} {{include.adding}} Adding {{preposition}} {{title}} - + To add a parameter that may be missing, select *Add Missing Params* on the parameters node menu. @@ -89,3 +100,6 @@ Select *Configure Base Asset* on the menu to access the configuration. {% endif %} +{% if include.more == "yes" %} +
+{% endif %} \ No newline at end of file diff --git a/docs/_includes/trading_system/close-stage.md b/docs/_includes/trading_system/close-stage.md index b8568f4ed..9c3d40eb0 100644 --- a/docs/_includes/trading_system/close-stage.md +++ b/docs/_includes/trading_system/close-stage.md @@ -3,8 +3,9 @@ {% assign title = "Close Stage" %} {% assign definition = site.data.trading_system.close_stage %} {% assign preposition = "the" %} +{% assign plural = "s" %} - + {% if include.heading != "" %} {{include.heading}} {{title}} @@ -12,19 +13,19 @@ {% if include.icon != "no" %} -{% if include.table == "y" %} +{% if include.table == "yes" and include.icon != "no" %}
{% endif %} -{% if include.table == "y" %} +{% if include.table == "yes" and include.icon != "no" %} {% endif %} {% endif %} -{% if include.definition != "regular" %} +{% if include.definition == "bold" %} {{ definition }} @@ -34,27 +35,37 @@ {% endif %} -{% if include.table == "y" and include.icon != "no" %} +{% if include.table == "yes" and include.icon != "no" %}
{% endif %} -{% if include.content != "n" %} +{% if include.more == "yes" and include.content == "more" %} +
Click to learn more about {{ title | downcase }}{{plural}} + +{% endif %} - +{% if include.content != "no" %} + + As explained earlier while discussing the open stage, the execution functionality is currently under development. Needless to say, execution of the closing orders is of the highest significance, but in the meantime some temporal execution limitations apply. Also pending development is the keeping of a formal trading log. The current functionality allows you to see each trade on the screen, along with all the corresponding details, as well as a consolidated report on the live trading panel. This information is stored as a data product, thus, it is not lost. In the future, the system should incorporate a user-friendly feature to browse such logs, and even help analyze them in search for potential optimizations of your trading systems. - + {% endif %} +{% if include.more == "yes" and include.content != "more" %} +
Click to learn more about {{ title | downcase }}{{plural}} + +{% endif %} + {% if include.adding != "" %} {{include.adding}} Adding {{preposition}} {{title}} - + To add a close stage node, select *Add Missing Stages* on the strategy node menu. All stages that may be missing are created along with the rest of the basic structure of nodes required to define each of them and their events. @@ -84,6 +95,10 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - + +{% endif %} + +{% if include.more == "yes" %} +
{% endif %} \ No newline at end of file diff --git a/docs/_includes/trading_system/condition.md b/docs/_includes/trading_system/condition.md index 923fbc569..f9534f178 100644 --- a/docs/_includes/trading_system/condition.md +++ b/docs/_includes/trading_system/condition.md @@ -3,8 +3,9 @@ {% assign title = "Condition" %} {% assign definition = site.data.trading_system.condition %} {% assign preposition = "a" %} +{% assign plural = "s" %} - + {% if include.heading != "" %} {{include.heading}} {{title}} @@ -12,19 +13,19 @@ {% if include.icon != "no" %} -{% if include.table == "y" %} +{% if include.table == "yes" and include.icon != "no" %}
{% endif %} -{% if include.table == "y" %} +{% if include.table == "yes" and include.icon != "no" %} {% endif %} {% endif %} -{% if include.definition != "regular" %} +{% if include.definition == "bold" %} {{ definition }} @@ -34,13 +35,18 @@ {% endif %} -{% if include.table == "y" and include.icon != "no" %} +{% if include.table == "yes" and include.icon != "no" %}
{% endif %} -{% if include.content != "n" %} +{% if include.more == "yes" and include.content == "more" %} +
Click to learn more about {{ title | downcase }}{{plural}} + +{% endif %} - +{% if include.content != "no" %} + + Therefore, conditions are used to mathematically describe what needs to happen with the market for a certain action to be taken. @@ -56,15 +62,20 @@ In the example above, conditions A and B are comparison statements that may eval {% include note.html content="To learn how to write conditions, start with the Syntax Overview." %} - + {% endif %} +{% if include.more == "yes" and include.content != "more" %} +
Click to learn more about {{ title | downcase }}{{plural}} + +{% endif %} + {% if include.adding != "" %} {{include.adding}} Adding {{preposition}} {{title}} - + To add a condition, select *Add Condition* on the corresponding situation node menu. A condition with its JavaScript code node is added. @@ -92,6 +103,10 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - + +{% endif %} + +{% if include.more == "yes" %} +
{% endif %} \ No newline at end of file diff --git a/docs/_includes/trading_system/fee-structure.md b/docs/_includes/trading_system/fee-structure.md index 2b9a2028d..12da5ea22 100644 --- a/docs/_includes/trading_system/fee-structure.md +++ b/docs/_includes/trading_system/fee-structure.md @@ -3,8 +3,9 @@ {% assign title = "Fee Structure" %} {% assign definition = site.data.trading_system.fee_structure %} {% assign preposition = "a" %} +{% assign plural = "s" %} - + {% if include.heading != "" %} {{include.heading}} {{title}} @@ -12,19 +13,19 @@ {% if include.icon != "no" %} -{% if include.table == "y" %} +{% if include.table == "yes" and include.icon != "no" %}
{% endif %} -{% if include.table == "y" %} +{% if include.table == "yes" and include.icon != "no" %} {% endif %} {% endif %} -{% if include.definition != "regular" %} +{% if include.definition == "bold" %} {{ definition }} @@ -34,13 +35,18 @@ {% endif %} -{% if include.table == "y" and include.icon != "no" %} +{% if include.table == "yes" and include.icon != "no" %}
{% endif %} -{% if include.content != "n" %} +{% if include.more == "yes" and include.content == "more" %} +
Click to learn more about {{ title | downcase }}{{plural}} + +{% endif %} - +{% if include.content != "no" %} + + Exchange fees are a crucial part of trading. A strategy may work like a charm when you leave fees out of the equation but would lead you to bankruptcy in a live trading situation. @@ -54,15 +60,20 @@ The trade hits the take profit target above the Position Rate level, however, du In the context of forward testing and live trading sessions, the fee structure assumptions do not affect actual transactions. However, the parameter is taken into account when creating simulation layers, which are also available during forward testing and live trading. - + {% endif %} +{% if include.more == "yes" and include.content != "more" %} +
Click to learn more about {{ title | downcase }}{{plural}} + +{% endif %} + {% if include.adding != "" %} {{include.adding}} Adding {{preposition}} {{title}} - + To add a parameter that may be missing, select *Add Missing Params* on the parameters node menu. @@ -95,7 +106,22 @@ Select *Configure Fee Structure* on the menu to access the configuration. {% include important.html content="Remember that, for the time being, and until the new execution engine is released, all orders placed by the trading bot are *market orders*, thus, the *taker* fee applies in all cases." %} - + {% endif %} +{% if include.starting != "" %} + +{{include.starting}} Starting {{preposition}} {{title}} + + + +XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + + + +{% endif %} + +{% if include.more == "yes" %} +
+{% endif %} \ No newline at end of file diff --git a/docs/_includes/trading_system/formula.md b/docs/_includes/trading_system/formula.md index 21cdb034f..4b971e903 100644 --- a/docs/_includes/trading_system/formula.md +++ b/docs/_includes/trading_system/formula.md @@ -3,8 +3,9 @@ {% assign title = "Formula" %} {% assign definition = site.data.trading_system.formula %} {% assign preposition = "a" %} +{% assign plural = "s" %} - + {% if include.heading != "" %} {{include.heading}} {{title}} @@ -12,19 +13,19 @@ {% if include.icon != "no" %} -{% if include.table == "y" %} +{% if include.table == "yes" and include.icon != "no" %}
{% endif %} -{% if include.table == "y" %} +{% if include.table == "yes" and include.icon != "no" %} {% endif %} {% endif %} -{% if include.definition != "regular" %} +{% if include.definition == "bold" %} {{ definition }} @@ -34,13 +35,18 @@ {% endif %} -{% if include.table == "y" and include.icon != "no" %} +{% if include.table == "yes" and include.icon != "no" %}
{% endif %} -{% if include.content != "n" %} +{% if include.more == "yes" and include.content == "more" %} +
Click to learn more about {{ title | downcase }}{{plural}} + +{% endif %} - +{% if include.content != "no" %} + + In the context of a trading system, formulas are used to determine the values for stopLoss, takeProfit, positionRate and positionSize. @@ -52,15 +58,20 @@ Formulas may use [internal variables](suite-internal-variables.html) made availa {% include note.html content="To learn which variables may be used in formulas, see the page about internal variables." %} - + {% endif %} +{% if include.more == "yes" and include.content != "more" %} +
Click to learn more about {{ title | downcase }}{{plural}} + +{% endif %} + {% if include.adding != "" %} {{include.adding}} Adding {{preposition}} {{title}} - + To add a formula, select *Add Formula* on the corresponding parent node menu. @@ -76,7 +87,7 @@ To add a formula, select *Add Formula* on the corresponding parent node menu. XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - + {% endif %} @@ -84,10 +95,14 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX {{include.starting}} Starting {{preposition}} {{title}} - + XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - + +{% endif %} + +{% if include.more == "yes" %} +
{% endif %} \ No newline at end of file diff --git a/docs/_includes/trading_system/initial-stop.md b/docs/_includes/trading_system/initial-stop.md index cd7321679..81aadbfc5 100644 --- a/docs/_includes/trading_system/initial-stop.md +++ b/docs/_includes/trading_system/initial-stop.md @@ -3,8 +3,9 @@ {% assign title = "Initial Stop" %} {% assign definition = site.data.trading_system.initial_stop %} {% assign preposition = "the" %} +{% assign plural = "s" %} - + {% if include.heading != "" %} {{include.heading}} {{title}} @@ -12,19 +13,19 @@ {% if include.icon != "no" %} -{% if include.table == "y" %} +{% if include.table == "yes" and include.icon != "no" %}
{% endif %} -{% if include.table == "y" %} +{% if include.table == "yes" and include.icon != "no" %} {% endif %} {% endif %} -{% if include.definition != "regular" %} +{% if include.definition == "bold" %} {{ definition }} @@ -34,13 +35,18 @@ {% endif %} -{% if include.table == "y" and include.icon != "no" %} +{% if include.table == "yes" and include.icon != "no" %}
{% endif %} -{% if include.content != "n" %} +{% if include.more == "yes" and include.content == "more" %} +
Click to learn more about {{ title | downcase }}{{plural}} + +{% endif %} - +{% if include.content != "no" %} + + Notice that the setting of the stop target has no relation to the execution of orders. The stop is a target, not an order to be placed. That is, the system does not place stop orders. @@ -50,15 +56,20 @@ Instead, the trading bot instance monitors the market, and only once the stop ta The initial target is set in phase 0, that is, the departing point for the management of the trade to be handled in the manage stage. - + {% endif %} +{% if include.more == "yes" and include.content != "more" %} +
Click to learn more about {{ title | downcase }}{{plural}} + +{% endif %} + {% if include.adding != "" %} {{include.adding}} Adding {{preposition}} {{title}} - + To add an initial stop node, select *Add Missing Items* on the initial definitions node menu. All items that may be missing are created along with the rest of the basic structure of nodes required to define each of them. @@ -74,7 +85,7 @@ To add an initial stop node, select *Add Missing Items* on the initial definitio XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - + {% endif %} @@ -82,10 +93,14 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX {{include.starting}} Starting {{preposition}} {{title}} - + XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - + +{% endif %} + +{% if include.more == "yes" %} +
{% endif %} \ No newline at end of file diff --git a/docs/_includes/trading_system/initial-take-profit.md b/docs/_includes/trading_system/initial-take-profit.md index 6b4bf0c12..1dd6c12f7 100644 --- a/docs/_includes/trading_system/initial-take-profit.md +++ b/docs/_includes/trading_system/initial-take-profit.md @@ -3,8 +3,9 @@ {% assign title = "Initial Take Profit" %} {% assign definition = site.data.trading_system.initial_take_profit %} {% assign preposition = "the" %} +{% assign plural = "s" %} - + {% if include.heading != "" %} {{include.heading}} {{title}} @@ -12,19 +13,19 @@ {% if include.icon != "no" %} -{% if include.table == "y" %} +{% if include.table == "yes" and include.icon != "no" %}
{% endif %} -{% if include.table == "y" %} +{% if include.table == "yes" and include.icon != "no" %} {% endif %} {% endif %} -{% if include.definition != "regular" %} +{% if include.definition == "bold" %} {{ definition }} @@ -34,27 +35,37 @@ {% endif %} -{% if include.table == "y" and include.icon != "no" %} +{% if include.table == "yes" and include.icon != "no" %}
{% endif %} -{% if include.content != "n" %} +{% if include.more == "yes" and include.content == "more" %} +
Click to learn more about {{ title | downcase }}{{plural}} + +{% endif %} - +{% if include.content != "no" %} + + Pretty much like with the initial stop, the initial take profit is a target, and not an order to be placed. Only when the trading bot instance detects that the target has been hit does it place an order to close the trade. The initial target is set in phase 0, which may shift to the following phase once the corresponding next phase event is validated. - + {% endif %} +{% if include.more == "yes" and include.content != "more" %} +
Click to learn more about {{ title | downcase }}{{plural}} + +{% endif %} + {% if include.adding != "" %} {{include.adding}} Adding {{preposition}} {{title}} - + To add an initial take-profit node, select *Add Missing Items* on the initial definitions node menu. All items that may be missing are created along with the rest of the basic structure of nodes required to define each of them. @@ -70,7 +81,7 @@ To add an initial take-profit node, select *Add Missing Items* on the initial de XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - + {% endif %} @@ -78,10 +89,14 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX {{include.starting}} Starting {{preposition}} {{title}} - + XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - + +{% endif %} + +{% if include.more == "yes" %} +
{% endif %} \ No newline at end of file diff --git a/docs/_includes/trading_system/manage-stage.md b/docs/_includes/trading_system/manage-stage.md index 5ec813d40..15990f2ba 100644 --- a/docs/_includes/trading_system/manage-stage.md +++ b/docs/_includes/trading_system/manage-stage.md @@ -3,8 +3,9 @@ {% assign title = "Manage Stage" %} {% assign definition = site.data.trading_system.manage_stage %} {% assign preposition = "the" %} +{% assign plural = "s" %} - + {% if include.heading != "" %} {{include.heading}} {{title}} @@ -12,19 +13,19 @@ {% if include.icon != "no" %} -{% if include.table == "y" %} +{% if include.table == "yes" and include.icon != "no" %}
{% endif %} -{% if include.table == "y" %} +{% if include.table == "yes" and include.icon != "no" %} {% endif %} {% endif %} -{% if include.definition != "regular" %} +{% if include.definition == "bold" %} {{ definition }} @@ -34,13 +35,18 @@ {% endif %} -{% if include.table == "y" and include.icon != "no" %} +{% if include.table == "yes" and include.icon != "no" %}
{% endif %} -{% if include.content != "n" %} +{% if include.more == "yes" and include.content == "more" %} +
Click to learn more about {{ title | downcase }}{{plural}} + +{% endif %} - +{% if include.content != "no" %} + + The management of a trade aims to increase the efficiency of your trading system. Conceptually, a trade is not an instant event, but an event which has an opening, a period of maturation, and a closing. The management of the trade happens in that period of maturation. @@ -56,15 +62,20 @@ The idea of having different phases comes from the notion that big market moves All of these considerations should feed the dynamic analysis performed as the trade develops, and may be contrasted with the predefined conditions that may push take profit or stop further, entering one phase after the next. - + {% endif %} +{% if include.more == "yes" and include.content != "more" %} +
Click to learn more about {{ title | downcase }}{{plural}} + +{% endif %} + {% if include.adding != "" %} {{include.adding}} Adding {{preposition}} {{title}} - + To add a manage stage node, select *Add Missing Stages* on the strategy node menu. All stages that may be missing are created along with the rest of the basic structure of nodes required to define each of them and their events. @@ -82,6 +93,22 @@ To add a manage stage node, select *Add Missing Stages* on the strategy node men XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - + +{% endif %} + +{% if include.starting != "" %} + +{{include.starting}} Starting {{preposition}} {{title}} + + + +XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + + + +{% endif %} + +{% if include.more == "yes" %} +
{% endif %} \ No newline at end of file diff --git a/docs/_includes/trading_system/open-stage.md b/docs/_includes/trading_system/open-stage.md index 6b69e4981..62cd21890 100644 --- a/docs/_includes/trading_system/open-stage.md +++ b/docs/_includes/trading_system/open-stage.md @@ -3,8 +3,9 @@ {% assign title = "Open Stage" %} {% assign definition = site.data.trading_system.open_stage %} {% assign preposition = "the" %} +{% assign plural = "s" %} - + {% if include.heading != "" %} {{include.heading}} {{title}} @@ -12,19 +13,19 @@ {% if include.icon != "no" %} -{% if include.table == "y" %} +{% if include.table == "yes" and include.icon != "no" %}
{% endif %} -{% if include.table == "y" %} +{% if include.table == "yes" and include.icon != "no" %} {% endif %} {% endif %} -{% if include.definition != "regular" %} +{% if include.definition == "bold" %} {{ definition }} @@ -34,13 +35,18 @@ {% endif %} -{% if include.table == "y" and include.icon != "no" %} +{% if include.table == "yes" and include.icon != "no" %}
{% endif %} -{% if include.content != "n" %} +{% if include.more == "yes" and include.content == "more" %} +
Click to learn more about {{ title | downcase }}{{plural}} + +{% endif %} - +{% if include.content != "no" %} + + Conceptually, the open stage deals with the details that concern the opening of a trade once the decision to take a position has been made. In this stage, you deal with the aforementioned parameters, each of which is defined by a formula. @@ -48,15 +54,20 @@ Ideally, the open stage would also handle the parameters that define the executi {% include note.html content="Learn more about the temporal execution limitations." %} - + {% endif %} +{% if include.more == "yes" and include.content != "more" %} +
Click to learn more about {{ title | downcase }}{{plural}} + +{% endif %} + {% if include.adding != "" %} {{include.adding}} Adding {{preposition}} {{title}} - + To add an open stage node, select *Add Missing Stages* on the strategy node menu. All stages that may be missing are created along with the rest of the basic structure of nodes required to define each of them and their events. @@ -74,6 +85,22 @@ To add an open stage node, select *Add Missing Stages* on the strategy node menu XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - + +{% endif %} + +{% if include.starting != "" %} + +{{include.starting}} Starting {{preposition}} {{title}} + + + +XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + + + +{% endif %} + +{% if include.more == "yes" %} +
{% endif %} \ No newline at end of file diff --git a/docs/_includes/trading_system/parameters.md b/docs/_includes/trading_system/parameters.md index 75eb3e9a8..984af83f6 100644 --- a/docs/_includes/trading_system/parameters.md +++ b/docs/_includes/trading_system/parameters.md @@ -3,8 +3,9 @@ {% assign title = "Parameters" %} {% assign definition = site.data.trading_system.parameters %} {% assign preposition = "" %} +{% assign plural = "" %} - + {% if include.heading != "" %} {{include.heading}} {{title}} @@ -12,19 +13,19 @@ {% if include.icon != "no" %} -{% if include.table == "y" %} +{% if include.table == "yes" and include.icon != "no" %}
{% endif %} -{% if include.table == "y" %} +{% if include.table == "yes" and include.icon != "no" %} {% endif %} {% endif %} -{% if include.definition != "regular" %} +{% if include.definition == "bold" %} {{ definition }} @@ -34,25 +35,35 @@ {% endif %} -{% if include.table == "y" and include.icon != "no" %} +{% if include.table == "yes" and include.icon != "no" %}
{% endif %} -{% if include.content != "n" %} +{% if include.more == "yes" and include.content == "more" %} +
Click to learn more about {{ title | downcase }}{{plural}} + +{% endif %} - +{% if include.content != "no" %} + + Each testing session has its own set of parameters. This allows you to configure different trading sessions with different parameters, and go back and forth between them as required. For instance, you may have different backtesting sessions with different date ranges, different exchange fees or different slippage settings. - + {% endif %} +{% if include.more == "yes" and include.content != "more" %} +
Click to learn more about {{ title | downcase }}{{plural}} + +{% endif %} + {% if include.adding != "" %} {{include.adding}} Adding {{preposition}} {{title}} - + To add a parameters node, select *Add Parameters* on the session or the trading system menu, depending on the context. When a parameters node is added, the full set of parameters are created with it. @@ -70,7 +81,23 @@ If you already have a parameters node but are missing some of the parameters, th XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - + {% endif %} +{% if include.starting != "" %} + +{{include.starting}} Starting {{preposition}} {{title}} + + + +XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + + + +{% endif %} + +{% if include.more == "yes" %} +
+{% endif %} + diff --git a/docs/_includes/trading_system/position-rate.md b/docs/_includes/trading_system/position-rate.md index 06c89ba07..da2c9593a 100644 --- a/docs/_includes/trading_system/position-rate.md +++ b/docs/_includes/trading_system/position-rate.md @@ -3,8 +3,10 @@ {% assign title = "Position Rate" %} {% assign definition = site.data.trading_system.position_rate %} {% assign preposition = "the" %} +{% assign plural = "s" %} - + + {% if include.heading != "" %} {{include.heading}} {{title}} @@ -12,19 +14,19 @@ {% if include.icon != "no" %} -{% if include.table == "y" %} +{% if include.table == "yes" and include.icon != "no" %}
{% endif %} -{% if include.table == "y" %} +{% if include.table == "yes" and include.icon != "no" %} {% endif %} {% endif %} -{% if include.definition != "regular" %} +{% if include.definition == "bold" %} {{ definition }} @@ -34,25 +36,35 @@ {% endif %} -{% if include.table == "y" and include.icon != "no" %} +{% if include.table == "yes" and include.icon != "no" %}
{% endif %} -{% if include.content != "n" %} +{% if include.more == "yes" and include.content == "more" %} +
Click to learn more about {{ title | downcase }}{{plural}} + +{% endif %} - +{% if include.content != "no" %} + + However, for the time being, the formula is overridden by the system as execution is currently limited to market orders until a more robust execution system is deployed. Therefore, the position rate is currently taken from the closing value of the last candle. - + {% endif %} +{% if include.more == "yes" and include.content != "more" %} +
Click to learn more about {{ title | downcase }}{{plural}} + +{% endif %} + {% if include.adding != "" %} {{include.adding}} Adding {{preposition}} {{title}} - + To add a position rate node, select *Add Missing Items* on the initial definitions node menu. All items that may be missing are created along with the rest of the basic structure of nodes required to define each of them. @@ -68,6 +80,22 @@ To add a position rate node, select *Add Missing Items* on the initial definitio XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - + +{% endif %} + +{% if include.starting != "" %} + +{{include.starting}} Starting {{preposition}} {{title}} + + + +XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + + + +{% endif %} + +{% if include.more == "yes" %} +
{% endif %} \ No newline at end of file diff --git a/docs/_includes/trading_system/position-size.md b/docs/_includes/trading_system/position-size.md index f466f3aa1..ed3d96de7 100644 --- a/docs/_includes/trading_system/position-size.md +++ b/docs/_includes/trading_system/position-size.md @@ -3,8 +3,9 @@ {% assign title = "Position Size" %} {% assign definition = site.data.trading_system.position_size %} {% assign preposition = "the" %} +{% assign plural = "s" %} - + {% if include.heading != "" %} {{include.heading}} {{title}} @@ -12,19 +13,19 @@ {% if include.icon != "no" %} -{% if include.table == "y" %} +{% if include.table == "yes" and include.icon != "no" %}
{% endif %} -{% if include.table == "y" %} +{% if include.table == "yes" and include.icon != "no" %} {% endif %} {% endif %} -{% if include.definition != "regular" %} +{% if include.definition == "bold" %} {{ definition }} @@ -34,25 +35,35 @@ {% endif %} -{% if include.table == "y" and include.icon != "no" %} +{% if include.table == "yes" and include.icon != "no" %}
{% endif %} -{% if include.content != "n" %} +{% if include.more == "yes" and include.content == "more" %} +
Click to learn more about {{ title | downcase }}{{plural}} + +{% endif %} - +{% if include.content != "no" %} + + - + {% endif %} +{% if include.more == "yes" and include.content != "more" %} +
Click to learn more about {{ title | downcase }}{{plural}} + +{% endif %} + {% if include.adding != "" %} {{include.adding}} Adding {{preposition}} {{title}} - + To add a position size node, select *Add Missing Items* on the initial definitions node menu. All items that may be missing are created along with the rest of the basic structure of nodes required to define each of them. @@ -68,6 +79,22 @@ To add a position size node, select *Add Missing Items* on the initial definitio XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - + +{% endif %} + +{% if include.starting != "" %} + +{{include.starting}} Starting {{preposition}} {{title}} + + + +XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + + + +{% endif %} + +{% if include.more == "yes" %} +
{% endif %} \ No newline at end of file diff --git a/docs/_includes/trading_system/quoted-asset.md b/docs/_includes/trading_system/quoted-asset.md index 552c0a88c..a58d32fb8 100644 --- a/docs/_includes/trading_system/quoted-asset.md +++ b/docs/_includes/trading_system/quoted-asset.md @@ -3,8 +3,9 @@ {% assign title = "Quoted Asset" %} {% assign definition = site.data.trading_system.quoted_asset %} {% assign preposition = "a" %} +{% assign plural = "s" %} - + {% if include.heading != "" %} {{include.heading}} {{title}} @@ -12,19 +13,19 @@ {% if include.icon != "no" %} -{% if include.table == "y" %} +{% if include.table == "yes" and include.icon != "no" %}
{% endif %} -{% if include.table == "y" %} +{% if include.table == "yes" and include.icon != "no" %} {% endif %} {% endif %} -{% if include.definition != "regular" %} +{% if include.definition == "bold" %} {{ definition }} @@ -34,25 +35,35 @@ {% endif %} -{% if include.table == "y" and include.icon != "no" %} +{% if include.table == "yes" and include.icon != "no" %}
{% endif %} -{% if include.content != "n" %} +{% if include.more == "yes" and include.content == "more" %} +
Click to learn more about {{ title | downcase }}{{plural}} + +{% endif %} - +{% if include.content != "no" %} + + The quoted asset must reference the second asset in the same market of the same exchange as the reference established with the base asset. - + {% endif %} +{% if include.more == "yes" and include.content != "more" %} +
Click to learn more about {{ title | downcase }}{{plural}} + +{% endif %} + {% if include.adding != "" %} {{include.adding}} Adding {{preposition}} {{title}} - + To add a parameter that may be missing, select *Add Missing Params* on the parameters node menu. @@ -70,6 +81,22 @@ To add a parameter that may be missing, select *Add Missing Params* on the param XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - + +{% endif %} + +{% if include.starting != "" %} + +{{include.starting}} Starting {{preposition}} {{title}} + + + +XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + + + +{% endif %} + +{% if include.more == "yes" %} +
{% endif %} \ No newline at end of file diff --git a/docs/_includes/trading_system/situation.md b/docs/_includes/trading_system/situation.md index 8af1dbedc..db3e3b671 100644 --- a/docs/_includes/trading_system/situation.md +++ b/docs/_includes/trading_system/situation.md @@ -3,8 +3,9 @@ {% assign title = "Situation" %} {% assign definition = site.data.trading_system.situation %} {% assign preposition = "a" %} +{% assign plural = "s" %} - + {% if include.heading != "" %} {{include.heading}} {{title}} @@ -12,19 +13,19 @@ {% if include.icon != "no" %} -{% if include.table == "y" %} +{% if include.table == "yes" and include.icon != "no" %}
{% endif %} -{% if include.table == "y" %} +{% if include.table == "yes" and include.icon != "no" %} {% endif %} {% endif %} -{% if include.definition != "regular" %} +{% if include.definition == "bold" %} {{ definition }} @@ -34,13 +35,18 @@ {% endif %} -{% if include.table == "y" and include.icon != "no" %} +{% if include.table == "yes" and include.icon != "no" %}
{% endif %} -{% if include.content != "n" %} +{% if include.more == "yes" and include.content == "more" %} +
Click to learn more about {{ title | downcase }}{{plural}} + +{% endif %} - +{% if include.content != "no" %} + + In other words, you define situations in which you wish a certain event to happen (*i.e.:* trigger on the strategy, take a position, etc.) and each situation is described as a set of conditions that need to be met for the event to be triggered. @@ -48,15 +54,20 @@ A situation gets validated when all conditions under it are true. An event may have more than one situation attached to it. In such a case, when any of the situations gets validated, it triggers the event. That is, events may be triggered in different circumstances, meaning that you are free to define different situations upon which the same event would be triggered. In such a case, when any of the situations evaluate true, then the event is triggered. - + {% endif %} +{% if include.more == "yes" and include.content != "more" %} +
Click to learn more about {{ title | downcase }}{{plural}} + +{% endif %} + {% if include.adding != "" %} {{include.adding}} Adding {{preposition}} {{title}} - + To add a situation, select *Add Situation* on the corresponding event node menu. A situation is added along with a condition and JavaScript code node. @@ -72,6 +83,22 @@ To add a situation, select *Add Situation* on the corresponding event node menu. XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - + +{% endif %} + +{% if include.starting != "" %} + +{{include.starting}} Starting {{preposition}} {{title}} + + + +XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + + + +{% endif %} + +{% if include.more == "yes" %} +
{% endif %} \ No newline at end of file diff --git a/docs/_includes/trading_system/slippage.md b/docs/_includes/trading_system/slippage.md index e2c44b857..9148f9f76 100644 --- a/docs/_includes/trading_system/slippage.md +++ b/docs/_includes/trading_system/slippage.md @@ -2,9 +2,10 @@ {% assign title = "Slippage" %} {% assign definition = site.data.trading_system.slippage %} -{% assign preposition = "a" %} +{% assign preposition = "" %} +{% assign plural = "" %} - + {% if include.heading != "" %} {{include.heading}} {{title}} @@ -12,19 +13,19 @@ {% if include.icon != "no" %} -{% if include.table == "y" %} +{% if include.table == "yes" and include.icon != "no" %}
{% endif %} -{% if include.table == "y" %} +{% if include.table == "yes" and include.icon != "no" %} {% endif %} {% endif %} -{% if include.definition != "regular" %} +{% if include.definition == "bold" %} {{ definition }} @@ -34,27 +35,37 @@ {% endif %} -{% if include.table == "y" and include.icon != "no" %} +{% if include.table == "yes" and include.icon != "no" %}
{% endif %} -{% if include.content != "n" %} +{% if include.more == "yes" and include.content == "more" %} +
Click to learn more about {{ title | downcase }}{{plural}} + +{% endif %} - +{% if include.content != "no" %} + + In the context of forward testing and live trading sessions, slippage does not affect the actual transactions. However, the parameter is taken into account when creating simulation layers, which are also available during forward testing and live trading. Slippage is factored both in the session reports and in the graphic representation of each trade provided by the simulation trades product of the trading bot. - + {% endif %} +{% if include.more == "yes" and include.content != "more" %} +
Click to learn more about {{ title | downcase }}{{plural}} + +{% endif %} + {% if include.adding != "" %} {{include.adding}} Adding {{preposition}} {{title}} - + To add a parameter that may be missing, select *Add Missing Params* on the parameters node menu. @@ -88,6 +99,22 @@ The number you enter is applied as a percentage of the price of the order and ad {% include note.html content="If the slippage parameter is left empty or detached both from your session and your trading system, slippage is not computed during simulations."%} - + +{% endif %} + +{% if include.starting != "" %} + +{{include.starting}} Starting {{preposition}} {{title}} + + + +XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + + + +{% endif %} + +{% if include.more == "yes" %} +
{% endif %} \ No newline at end of file diff --git a/docs/_includes/trading_system/strategy.md b/docs/_includes/trading_system/strategy.md index 3ed7dbf7c..7176c65a9 100644 --- a/docs/_includes/trading_system/strategy.md +++ b/docs/_includes/trading_system/strategy.md @@ -3,8 +3,9 @@ {% assign title = "Strategy" %} {% assign definition = site.data.trading_system.strategy %} {% assign preposition = "a" %} +{% assign plural = "" %} - + {% if include.heading != "" %} {{include.heading}} {{title}} @@ -12,19 +13,19 @@ {% if include.icon != "no" %} -{% if include.table == "y" %} +{% if include.table == "yes" and include.icon != "no" %}
{% endif %} -{% if include.table == "y" %} +{% if include.table == "yes" and include.icon != "no" %} {% endif %} {% endif %} -{% if include.definition != "regular" %} +{% if include.definition == "bold" %} {{ definition }} @@ -34,13 +35,18 @@ {% endif %} -{% if include.table == "y" and include.icon != "no" %} +{% if include.table == "yes" and include.icon != "no" %}
{% endif %} -{% if include.content != "n" %} +{% if include.more == "yes" and include.content == "more" %} +
Click to learn more about strategies + +{% endif %} - +{% if include.content != "no" %} + + The definition of a strategy may be analyzed in three sections: @@ -63,15 +69,20 @@ Your investment plan or trading carrer may have any number of goals (*e.g.: accu The definition of strategy points to the concept of *a trade*. A trade is a process that exchanges the base asset for the quoted asset and that—after some time, as the trade develops and targets are hit—exchanges back the quoted asset for the base asset. The first and foremost rule of a trade is to preserve capital and its main goal is to increase it. - + {% endif %} +{% if include.more == "yes" and include.content != "more" %} +
Click to learn more about {{ title | downcase }}{{plural}} + +{% endif %} + {% if include.adding != "" %} {{include.adding}} Adding {{preposition}} {{title}} - + To add a strategy, select *Add Strategy* on the trading system node menu. The strategy node is created along with the rest of the basic structure of nodes required to define each of the strategy stages and their events. @@ -91,6 +102,22 @@ To add a strategy, select *Add Strategy* on the trading system node menu. The st XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - + +{% endif %} + +{% if include.starting != "" %} + +{{include.starting}} Starting {{preposition}} {{title}} + + + +XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + + + +{% endif %} + +{% if include.more == "yes" %} +
{% endif %} \ No newline at end of file diff --git a/docs/_includes/trading_system/take-position-event.md b/docs/_includes/trading_system/take-position-event.md index f070d2dd1..cee4efedc 100644 --- a/docs/_includes/trading_system/take-position-event.md +++ b/docs/_includes/trading_system/take-position-event.md @@ -3,8 +3,9 @@ {% assign title = "Take Position Event" %} {% assign definition = site.data.trading_system.take_position_event %} {% assign preposition = "the" %} +{% assign plural = "s" %} - + {% if include.heading != "" %} {{include.heading}} {{title}} @@ -12,19 +13,19 @@ {% if include.icon != "no" %} -{% if include.table == "y" %} +{% if include.table == "yes" and include.icon != "no" %}
{% endif %} -{% if include.table == "y" %} +{% if include.table == "yes" and include.icon != "no" %} {% endif %} {% endif %} -{% if include.definition != "regular" %} +{% if include.definition == "bold" %} {{ definition }} @@ -34,13 +35,18 @@ {% endif %} -{% if include.table == "y" and include.icon != "no" %} +{% if include.table == "yes" and include.icon != "no" %}
{% endif %} -{% if include.content != "n" %} +{% if include.more == "yes" and include.content == "more" %} +
Click to learn more about {{ title | downcase }}{{plural}} + +{% endif %} - +{% if include.content != "no" %} + + The trigger-on event merely selects a strategy to be considered for trading under the current market situation. The actual decision to enter a position may require more specific conditions to be met. For that reason, the take position event is a separate entity from the trigger-on event. @@ -48,15 +54,20 @@ Therefore, the take position event is defined with its own set of situations and Once the take position event is triggered, the decision to take a position has been made and there is nothing else to consider in that regard. Therefore, the system shifts from the trigger stage to the open stage. - + {% endif %} +{% if include.more == "yes" and include.content != "more" %} +
Click to learn more about {{ title | downcase }}{{plural}} + +{% endif %} + {% if include.adding != "" %} {{include.adding}} Adding {{preposition}} {{title}} - + To add a take position event node, select *Add Missing Events* on the trigger stage node menu. All events that may be missing are created along with the rest of the basic structure of nodes required to define each of them. @@ -72,6 +83,22 @@ To add a take position event node, select *Add Missing Events* on the trigger st XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - + +{% endif %} + +{% if include.starting != "" %} + +{{include.starting}} Starting {{preposition}} {{title}} + + + +XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + + + +{% endif %} + +{% if include.more == "yes" %} +
{% endif %} \ No newline at end of file diff --git a/docs/_includes/trading_system/template-sessions.md b/docs/_includes/trading_system/template-sessions.md index 9d0327426..94479e277 100644 --- a/docs/_includes/trading_system/template-sessions.md +++ b/docs/_includes/trading_system/template-sessions.md @@ -3,6 +3,7 @@ {% assign title = "XXXXXXXXXXXXXXXX" %} {% assign definition = site.data.network.XXXXXXXXXXXXXXXX %} {% assign preposition = "XXXXXXXXXXXXXXXX" %} +{% assign plural = "s" %} @@ -12,19 +13,19 @@ {% if include.icon != "no" %} -{% if include.table == "y" %} +{% if include.table == "yes" and include.icon != "no" %}
{% endif %} -{% if include.table == "y" %} +{% if include.table == "yes" and include.icon != "no" %} {% endif %} {% endif %} -{% if include.definition != "regular" %} +{% if include.definition == "bold" %} {{ definition }} @@ -34,11 +35,16 @@ {% endif %} -{% if include.table == "y" and include.icon != "no" %} +{% if include.table == "yes" and include.icon != "no" %}
{% endif %} -{% if include.content != "n" %} +{% if include.more == "yes" and include.content == "more" %} +
Click to learn more about {{ title | downcase }}{{plural}} + +{% endif %} + +{% if include.content != "no" %} @@ -48,6 +54,11 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX {% endif %} +{% if include.more == "yes" and include.content != "more" %} +
Click to learn more about {{ title | downcase }}{{plural}} + +{% endif %} + {% if include.adding != "" %} {{include.adding}} Adding {{preposition}} {{title}} @@ -82,4 +93,8 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX +{% endif %} + +{% if include.more == "yes" %} +
{% endif %} \ No newline at end of file diff --git a/docs/_includes/trading_system/time-frame.md b/docs/_includes/trading_system/time-frame.md index eb19e84a9..78d267d3c 100644 --- a/docs/_includes/trading_system/time-frame.md +++ b/docs/_includes/trading_system/time-frame.md @@ -3,8 +3,9 @@ {% assign title = "Time Frame" %} {% assign definition = site.data.trading_system.time_frame %} {% assign preposition = "a" %} +{% assign plural = "s" %} - + {% if include.heading != "" %} {{include.heading}} {{title}} @@ -12,19 +13,19 @@ {% if include.icon != "no" %} -{% if include.table == "y" %} +{% if include.table == "yes" and include.icon != "no" %}
{% endif %} -{% if include.table == "y" %} +{% if include.table == "yes" and include.icon != "no" %} {% endif %} {% endif %} -{% if include.definition != "regular" %} +{% if include.definition == "bold" %} {{ definition }} @@ -34,27 +35,37 @@ {% endif %} -{% if include.table == "y" and include.icon != "no" %} +{% if include.table == "yes" and include.icon != "no" %}
{% endif %} -{% if include.content != "n" %} +{% if include.more == "yes" and include.content == "more" %} +
Click to learn more about {{ title | downcase }}{{plural}} + +{% endif %} - +{% if include.content != "no" %} + + In the context of backtesting sessions, what time frame you decide to run the session on depends on the strategies being tested. If strategies make decisions based on the 1 hour candle and above, then ```01-hs``` may be the best choice. However, if decisions are influenced by sub-hour candles then you should match the time frame accordingly. In the context of live sessions, that is, paper trading, forward testing and live trading, you should run the session on the ```01-min``` time frame so that the trading bot reacts fast when the price tags the take profit or stop loss targets. - + {% endif %} +{% if include.more == "yes" and include.content != "more" %} +
Click to learn more about {{ title | downcase }}{{plural}} + +{% endif %} + {% if include.adding != "" %} {{include.adding}} Adding {{preposition}} {{title}} - + To add a parameter that may be missing, select *Add Missing Params* on the parameters node menu. @@ -106,7 +117,23 @@ Available options at larger time frames are: 24-hs ``` - + {% endif %} +{% if include.starting != "" %} + +{{include.starting}} Starting {{preposition}} {{title}} + + + +XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + + + +{% endif %} + +{% if include.more == "yes" %} +
+{% endif %} + diff --git a/docs/_includes/trading_system/time-range.md b/docs/_includes/trading_system/time-range.md index 83efd935a..6f24a3f30 100644 --- a/docs/_includes/trading_system/time-range.md +++ b/docs/_includes/trading_system/time-range.md @@ -3,8 +3,9 @@ {% assign title = "Time Range" %} {% assign definition = site.data.trading_system.time_range %} {% assign preposition = "a" %} +{% assign plural = "s" %} - + {% if include.heading != "" %} {{include.heading}} {{title}} @@ -12,19 +13,19 @@ {% if include.icon != "no" %} -{% if include.table == "y" %} +{% if include.table == "yes" and include.icon != "no" %}
{% endif %} -{% if include.table == "y" %} +{% if include.table == "yes" and include.icon != "no" %} {% endif %} {% endif %} -{% if include.definition != "regular" %} +{% if include.definition == "bold" %} {{ definition }} @@ -34,25 +35,35 @@ {% endif %} -{% if include.table == "y" and include.icon != "no" %} +{% if include.table == "yes" and include.icon != "no" %}
{% endif %} -{% if include.content != "n" %} +{% if include.more == "yes" and include.content == "more" %} +
Click to learn more about {{ title | downcase }}{{plural}} + +{% endif %} - +{% if include.content != "no" %} + + - + {% endif %} +{% if include.more == "yes" and include.content != "more" %} +
Click to learn more about {{ title | downcase }}{{plural}} + +{% endif %} + {% if include.adding != "" %} {{include.adding}} Adding {{preposition}} {{title}} - + To add a parameter that may be missing, select *Add Missing Params* on the parameters node menu. @@ -93,6 +104,22 @@ These sessions always start at the datetime the session is run, therefore, there * ```finalDatetime``` is the datetime the session finishes at. If you don't set a *finalDatetime* at the level of the testing session or the trading system, then the session runs for one year. - + +{% endif %} + +{% if include.starting != "" %} + +{{include.starting}} Starting {{preposition}} {{title}} + + + +XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + + + +{% endif %} + +{% if include.more == "yes" %} +
{% endif %} \ No newline at end of file diff --git a/docs/_includes/trading_system/trading-system.md b/docs/_includes/trading_system/trading-system.md index 4300a23cf..2916849c7 100644 --- a/docs/_includes/trading_system/trading-system.md +++ b/docs/_includes/trading_system/trading-system.md @@ -3,8 +3,9 @@ {% assign title = "Trading System" %} {% assign definition = site.data.trading_system.trading_system %} {% assign preposition = "a" %} +{% assign plural = "s" %} - + {% if include.heading != "" %} {{include.heading}} {{title}} @@ -12,19 +13,19 @@ {% if include.icon != "no" %} -{% if include.table == "y" %} +{% if include.table == "yes" and include.icon != "no" %}
{% endif %} -{% if include.table == "y" %} +{% if include.table == "yes" and include.icon != "no" %} {% endif %} {% endif %} -{% if include.definition != "regular" %} +{% if include.definition == "bold" %} {{ definition }} @@ -34,13 +35,18 @@ {% endif %} -{% if include.table == "y" and include.icon != "no" %} +{% if include.table == "yes" and include.icon != "no" %}
{% endif %} -{% if include.content != "n" %} +{% if include.more == "yes" and include.content == "more" %} +
Click to learn more about {{ title | downcase }}{{plural}} + +{% endif %} - +{% if include.content != "no" %} + + In practical terms, a trading system is a hierarchical arrangement organizing the actionable aspects of your investment plan. The hierarchy contains definitions regarding any number of trading strategies, all sharing the same market, the same base asset, and the same initial capital. @@ -48,15 +54,20 @@ You use a trading system to define strategies following the trading framework im The concept of describing strategies in phases is fundamental to the methodical aspect of the trading system, as it provides a framework to run every strategy with the same logic, which contributes to developing scalable trading systems that may grow to any number of strategies. - + {% endif %} +{% if include.more == "yes" and include.content != "more" %} +
Click to learn more about {{ title | downcase }}{{plural}} + +{% endif %} + {% if include.adding != "" %} {{include.adding}} Adding {{preposition}} {{title}} - + To add a trading system, select *Add Trading System* on the workspace node menu. @@ -74,6 +85,22 @@ To add a trading system, select *Add Trading System* on the workspace node menu. XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - + +{% endif %} + +{% if include.starting != "" %} + +{{include.starting}} Starting {{preposition}} {{title}} + + + +XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + + + +{% endif %} + +{% if include.more == "yes" %} +
{% endif %} \ No newline at end of file diff --git a/docs/_includes/trading_system/trigger-off-event.md b/docs/_includes/trading_system/trigger-off-event.md index 8bbc29f5d..f293b427a 100644 --- a/docs/_includes/trading_system/trigger-off-event.md +++ b/docs/_includes/trading_system/trigger-off-event.md @@ -3,8 +3,9 @@ {% assign title = "Trigger-Off Event" %} {% assign definition = site.data.trading_system.trigger-off_event %} {% assign preposition = "the" %} +{% assign plural = "s" %} - + {% if include.heading != "" %} {{include.heading}} {{title}} @@ -12,19 +13,19 @@ {% if include.icon != "no" %} -{% if include.table == "y" %} +{% if include.table == "yes" and include.icon != "no" %}
{% endif %} -{% if include.table == "y" %} +{% if include.table == "yes" and include.icon != "no" %} {% endif %} {% endif %} -{% if include.definition != "regular" %} +{% if include.definition == "bold" %} {{ definition }} @@ -34,13 +35,18 @@ {% endif %} -{% if include.table == "y" and include.icon != "no" %} +{% if include.table == "yes" and include.icon != "no" %}
{% endif %} -{% if include.content != "n" %} +{% if include.more == "yes" and include.content == "more" %} +
Click to learn more about {{ title | downcase }}{{plural}} + +{% endif %} - +{% if include.content != "no" %} + + In conceptual terms, the trigger-off event is the mechanism you use to define the situation in which the corresponding strategy should stop considering the trading opportunity signaled by the trigger-on event. That is, you use the trigger off event to describe the scenario for the invalidation of the trading idea behind the strategy. @@ -48,15 +54,20 @@ Once a strategy is triggered-on, only two possible scenarios may follow. Either In the first scenario, the strategy remains *on* until the trade is closed. As the trade is closed, the strategy is triggered-off. In the second scenario, the strategy is triggered-off immediately. - + {% endif %} +{% if include.more == "yes" and include.content != "more" %} +
Click to learn more about {{ title | downcase }}{{plural}} + +{% endif %} + {% if include.adding != "" %} {{include.adding}} Adding {{preposition}} {{title}} - + To add a trigger-off event node, select *Add Missing Events* on the trigger stage node menu. All events that may be missing are created along with the rest of the basic structure of nodes required to define each of them. @@ -72,6 +83,22 @@ To add a trigger-off event node, select *Add Missing Events* on the trigger stag XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - + +{% endif %} + +{% if include.starting != "" %} + +{{include.starting}} Starting {{preposition}} {{title}} + + + +XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + + + +{% endif %} + +{% if include.more == "yes" %} +
{% endif %} \ No newline at end of file diff --git a/docs/_includes/trading_system/trigger-on-event.md b/docs/_includes/trading_system/trigger-on-event.md index afad87b91..636ba2860 100644 --- a/docs/_includes/trading_system/trigger-on-event.md +++ b/docs/_includes/trading_system/trigger-on-event.md @@ -3,8 +3,9 @@ {% assign title = "Trigger-On Event" %} {% assign definition = site.data.trading_system.trigger-on_event %} {% assign preposition = "the" %} +{% assign plural = "s" %} - + {% if include.heading != "" %} {{include.heading}} {{title}} @@ -12,19 +13,19 @@ {% if include.icon != "no" %} -{% if include.table == "y" %} +{% if include.table == "yes" and include.icon != "no" %}
{% endif %} -{% if include.table == "y" %} +{% if include.table == "yes" and include.icon != "no" %} {% endif %} {% endif %} -{% if include.definition != "regular" %} +{% if include.definition == "bold" %} {{ definition }} @@ -34,27 +35,37 @@ {% endif %} -{% if include.table == "y" and include.icon != "no" %} +{% if include.table == "yes" and include.icon != "no" %}
{% endif %} -{% if include.content != "n" %} +{% if include.more == "yes" and include.content == "more" %} +
Click to learn more about {{ title | downcase }}{{plural}} + +{% endif %} - +{% if include.content != "no" %} + + In conceptual terms, the trigger-on event is the mechanism you use to define the specific situations in which you would consider trading with the corresponding strategy. Think of the trigger-on event as the definition of the scenario in which the trading idea behind the strategy should be carefully considered. Once a strategy is triggered-on, the system starts evaluating the take position event. In conceptual terms, it means that the system has been alerted that the trading idea behind the corresponding trading strategy has produced a signal and that it should carefully monitor the market for the opportunity to take a position. - + {% endif %} +{% if include.more == "yes" and include.content != "more" %} +
Click to learn more about {{ title | downcase }}{{plural}} + +{% endif %} + {% if include.adding != "" %} {{include.adding}} Adding {{preposition}} {{title}} - + To add a trigger-on event node, select *Add Missing Events* on the trigger stage node menu. All events that may be missing are created along with the rest of the basic structure of nodes required to define each of them. @@ -70,6 +81,22 @@ To add a trigger-on event node, select *Add Missing Events* on the trigger stage XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - + +{% endif %} + +{% if include.starting != "" %} + +{{include.starting}} Starting {{preposition}} {{title}} + + + +XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + + + +{% endif %} + +{% if include.more == "yes" %} +
{% endif %} \ No newline at end of file diff --git a/docs/_includes/trading_system/trigger-stage.md b/docs/_includes/trading_system/trigger-stage.md index c705ea442..a6894b48b 100644 --- a/docs/_includes/trading_system/trigger-stage.md +++ b/docs/_includes/trading_system/trigger-stage.md @@ -3,8 +3,9 @@ {% assign title = "Trigger Stage" %} {% assign definition = site.data.trading_system.trigger_stage %} {% assign preposition = "a" %} +{% assign plural = "s" %} - + {% if include.heading != "" %} {{include.heading}} {{title}} @@ -12,19 +13,19 @@ {% if include.icon != "no" %} -{% if include.table == "y" %} +{% if include.table == "yes" and include.icon != "no" %}
{% endif %} -{% if include.table == "y" %} +{% if include.table == "yes" and include.icon != "no" %} {% endif %} {% endif %} -{% if include.definition != "regular" %} +{% if include.definition == "bold" %} {{ definition }} @@ -34,13 +35,18 @@ {% endif %} -{% if include.table == "y" and include.icon != "no" %} +{% if include.table == "yes" and include.icon != "no" %}
{% endif %} -{% if include.content != "n" %} +{% if include.more == "yes" and include.content == "more" %} +
Click to learn more about {{ title | downcase }}{{plural}} + +{% endif %} - +{% if include.content != "no" %} + + A trading system may have multiple strategies designed for the same market, with the same base asset. @@ -52,15 +58,20 @@ The triggering-on of a strategy effectively blocks the selection of any other st As a corollary, if certain strategies are meant to trade under the same market situations and open trades concurrently, then those strategies should be put in separate trading systems. - + {% endif %} +{% if include.more == "yes" and include.content != "more" %} +
Click to learn more about {{ title | downcase }}{{plural}} + +{% endif %} + {% if include.adding != "" %} {{include.adding}} Adding {{preposition}} {{title}} - + To add a trigger stage node, select *Add Missing Stages* on the strategy node menu. All stages that may be missing are created along with the rest of the basic structure of nodes required to define each of them and their events. @@ -78,6 +89,22 @@ To add a trigger stage node, select *Add Missing Stages* on the strategy node me XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - + +{% endif %} + +{% if include.starting != "" %} + +{{include.starting}} Starting {{preposition}} {{title}} + + + +XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + + + +{% endif %} + +{% if include.more == "yes" %} +
{% endif %} \ No newline at end of file diff --git a/docs/css/customstyles.css b/docs/css/customstyles.css index f4db5c841..0f132c3ff 100644 --- a/docs/css/customstyles.css +++ b/docs/css/customstyles.css @@ -19,6 +19,14 @@ p { margin: 15px 0 15px 0; } +.nobr { + color: #0295aa; +} + +.nobr p { + margin: -25px 0 0 20px; +} + .bs-callout { padding: 20px; margin: 20px 0; @@ -240,7 +248,7 @@ ul#results-container a:hover { color: black; } #search-input { - padding: .5em; + padding: 0.2em .5em; margin-left:20px; width:20em; font-size: 0.8em; @@ -676,10 +684,10 @@ a.fa.fa-envelope-o.mailto { h2 {font-weight:700; font-size:170%; margin-top: 60px; padding-bottom: 5px;} h3 {font-weight:500; font-size:150%; margin-top: 30px;} -h4 {font-weight:400; font-size:140%;} -h5 {font-weight:400; font-size:130%; font-style:italic;} -h6 {font-weight:400; font-size:120%; font-style:italic;} -h7 {font-weight:400; font-size:110%; font-style:italic;} +h4 {font-weight:400; font-size:140%; margin-top: 30px;} +h5 {font-weight:400; font-size:130%; margin-top: 30px; font-style:italic;} +h6 {font-weight:400; font-size:120%; margin-top: 30px; font-style:italic;} +h7 {font-weight:400; font-size:110%; margin-top: 30px; font-style:italic;} /* Line on main headings spanning across the screen */ diff --git a/docs/pages/suite/suite-defining-a-trading-strategy.md b/docs/pages/suite/suite-defining-a-trading-strategy.md index e0badcafd..8f6122637 100644 --- a/docs/pages/suite/suite-defining-a-trading-strategy.md +++ b/docs/pages/suite/suite-defining-a-trading-strategy.md @@ -5,26 +5,26 @@ sidebar: suite_sidebar permalink: suite-defining-a-trading-strategy.html --- -{% include /trading_system/strategy.md heading="" icon="150-" adding="" configuring="" starting="" content="" definition="" table="y" %} +{% include /trading_system/strategy.md heading="" icon="150-" adding="##" configuring="" starting="" content="yes" definition="bold" table="yes" more="yes"%} -{% include /trading_system/trigger-stage.md heading="##" icon="150-" adding="" configuring="" starting="" content="" definition="" table="y" %} +{% include /trading_system/trigger-stage.md heading="##" icon="150-" adding="" configuring="" starting="" content="yes" definition="bold" table="yes" more="no"%} -{% include /trading_system/trigger-on-event.md heading="###" icon="" adding="" configuring="" starting="" content="" definition="regular" table="y" %} +{% include /trading_system/trigger-on-event.md heading="###" icon="" adding="" configuring="" starting="" content="yes" definition="" table="yes" more="no"%} -{% include /trading_system/trigger-off-event.md heading="###" icon="" adding="" configuring="" starting="" content="" definition="regular" table="y" %} +{% include /trading_system/trigger-off-event.md heading="###" icon="" adding="" configuring="" starting="" content="yes" definition="" table="yes" more="no"%} -{% include /trading_system/take-position-event.md heading="###" icon="" adding="" configuring="" starting="" content="" definition="regular" table="y" %} +{% include /trading_system/take-position-event.md heading="###" icon="" adding="" configuring="" starting="" content="yes" definition="" table="yes" more="no"%} -{% include /trading_system/open-stage.md heading="##" icon="150-" adding="" configuring="" starting="" content="" definition="" table="y" %} +{% include /trading_system/open-stage.md heading="##" icon="150-" adding="" configuring="" starting="" content="yes" definition="bold" table="yes" more="no"%} -{% include /trading_system/initial-stop.md heading="###" icon="" adding="" configuring="" starting="" content="" definition="regular" table="y" %} +{% include /trading_system/initial-stop.md heading="###" icon="" adding="" configuring="" starting="" content="yes" definition="" table="yes" more="no"%} -{% include /trading_system/initial-take-profit.md heading="###" icon="" adding="" configuring="" starting="" content="" definition="regular" table="y" %} +{% include /trading_system/initial-take-profit.md heading="###" icon="" adding="" configuring="" starting="" content="yes" definition="" table="yes" more="no"%} -{% include /trading_system/position-size.md heading="###" icon="" adding="" configuring="" starting="" content="" definition="regular" table="y" %} +{% include /trading_system/position-size.md heading="###" icon="" adding="" configuring="" starting="" content="yes" definition="" table="yes" more="no"%} -{% include /trading_system/position-rate.md heading="###" icon="" adding="" configuring="" starting="" content="" definition="regular" table="y" %} +{% include /trading_system/position-rate.md heading="###" icon="" adding="" configuring="" starting="" content="yes" definition="" table="yes" more="no"%} -{% include /trading_system/manage-stage.md heading="##" icon="150-" adding="" configuring="" starting="" content="" definition="" table="y" %} +{% include /trading_system/manage-stage.md heading="##" icon="150-" adding="" configuring="" starting="" content="yes" definition="bold" table="yes" more="no"%} -{% include /trading_system/close-stage.md heading="##" icon="150-" adding="" configuring="" starting="" content="" definition="" table="y" %} \ No newline at end of file +{% include /trading_system/close-stage.md heading="##" icon="150-" adding="" configuring="" starting="" content="yes" definition="bold" table="yes" more="no"%} diff --git a/docs/pages/suite/suite-network-hierarchy.md b/docs/pages/suite/suite-network-hierarchy.md index da1878799..1c9d25afc 100644 --- a/docs/pages/suite/suite-network-hierarchy.md +++ b/docs/pages/suite/suite-network-hierarchy.md @@ -325,19 +325,19 @@ You do not start or stop a trading process instance directly. Instead, you start -{% include /trading_system/parameters.md heading="##" icon="150-" adding="###" configuring="" %} +{% include /trading_system/parameters.md heading="##" icon="150-" adding="###" configuring="" starting="" content="yes" definition="bold" table="yes" more="no"%} -{% include /trading_system/base-asset.md heading="##" icon="150-" adding="###" configuring="###" %} +{% include /trading_system/base-asset.md heading="##" icon="150-" adding="###" configuring="###" starting="" content="yes" definition="bold" table="yes" more="no"%} -{% include /trading_system/quoted-asset.md heading="##" icon="150-" adding="###" configuring="" %} +{% include /trading_system/quoted-asset.md heading="##" icon="150-" adding="###" configuring="" starting="" content="yes" definition="bold" table="yes" more="no"%} -{% include /trading_system/time-frame.md heading="##" icon="150-" adding="###" configuring="###" %} +{% include /trading_system/time-frame.md heading="##" icon="150-" adding="###" configuring="###" starting="" content="yes" definition="bold" table="yes" more="no"%} -{% include /trading_system/time-range.md heading="##" icon="150-" adding="###" configuring="###" %} +{% include /trading_system/time-range.md heading="##" icon="150-" adding="###" configuring="###" starting="" content="yes" definition="bold" table="yes" more="no"%} -{% include /trading_system/slippage.md heading="##" icon="150-" adding="###" configuring="###" %} +{% include /trading_system/slippage.md heading="##" icon="150-" adding="###" configuring="###" starting="" content="yes" definition="bold" table="yes" more="no"%} -{% include /trading_system/fee-structure.md heading="##" icon="150-" adding="###" configuring="###" %} +{% include /trading_system/fee-structure.md heading="##" icon="150-" adding="###" configuring="###" starting="" content="yes" definition="bold" table="yes" more="no"%} diff --git a/docs/pages/suite/suite-parameters.md b/docs/pages/suite/suite-parameters.md index 0e5d111c2..a41f5bbe9 100644 --- a/docs/pages/suite/suite-parameters.md +++ b/docs/pages/suite/suite-parameters.md @@ -1,18 +1,18 @@ --- title: Parameters -summary: "Strategies are defined in a sequence of stages." +summary: "Parameters control the behavior of trading sessions and improve the quality of simulations." sidebar: suite_sidebar permalink: suite-parameters.html --- -{% include /trading_system/parameters.md heading="" icon="150-" adding="" configuring="" starting="" content="" definition="" table="y" %} +{% include /trading_system/parameters.md heading="" icon="150-" adding="" configuring="" starting="" content="yes" definition="bold" table="yes" more="no"%} -{% include /trading_system/base-asset.md heading="###" icon="" adding="" configuring="" starting="" content="" definition="regular" table="y" %} +{% include /trading_system/base-asset.md heading="##" icon="" adding="####" configuring="####" starting="" content="yes" definition="" table="yes" more="yes"%} -{% include /trading_system/quoted-asset.md heading="###" icon="" adding="" configuring="" starting="" content="" definition="regular" table="y" %} +{% include /trading_system/quoted-asset.md heading="##" icon="" adding="####" configuring="" starting="" content="yes" definition="" table="yes" more="yes"%} -{% include /trading_system/time-frame.md heading="###" icon="" adding="" configuring="" starting="" content="" definition="regular" table="y" %} +{% include /trading_system/time-frame.md heading="##" icon="" adding="" configuring="####" starting="" content="yes" definition="" table="yes" more="yes"%} -{% include /trading_system/slippage.md heading="###" icon="" adding="" configuring="" starting="" content="" definition="regular" table="y" %} +{% include /trading_system/slippage.md heading="##" icon="" adding="" configuring="####" starting="" content="yes" definition="" table="yes" more="yes"%} -{% include /trading_system/fee-structure.md heading="###" icon="" adding="" configuring="" starting="" content="" definition="regular" table="y" %} +{% include /trading_system/fee-structure.md heading="##" icon="" adding="" configuring="####" starting="" content="yes" definition="" table="yes" more="yes"%} diff --git a/docs/pages/suite/suite-trading-system-hierarchy.md b/docs/pages/suite/suite-trading-system-hierarchy.md index 0dee5ae73..9975fa311 100644 --- a/docs/pages/suite/suite-trading-system-hierarchy.md +++ b/docs/pages/suite/suite-trading-system-hierarchy.md @@ -955,38 +955,37 @@ toc: false +{% include /trading_system/trading-system.md heading="##" icon="150-" adding="###" configuring="" starting="" content="yes" definition="bold" table="yes" more="no"%} -{% include /trading_system/trading-system.md heading="##" icon="150-" adding="###" configuring="" %} +{% include /trading_system/parameters.md heading="##" icon="150-" adding="###" configuring="" starting="" content="yes" definition="bold" table="yes" more="no"%} -{% include /trading_system/parameters.md heading="##" icon="150-" adding="###" configuring="" %} +{% include /trading_system/base-asset.md heading="##" icon="150-" adding="###" configuring="###" starting="" content="yes" definition="bold" table="yes" more="no"%} -{% include /trading_system/base-asset.md heading="##" icon="150-" adding="###" configuring="###" %} +{% include /trading_system/quoted-asset.md heading="##" icon="150-" adding="###" configuring="" starting="" content="yes" definition="bold" table="yes" more="no"%} -{% include /trading_system/quoted-asset.md heading="##" icon="150-" adding="###" configuring="" %} +{% include /trading_system/time-frame.md heading="##" icon="150-" adding="###" configuring="###" starting="" content="yes" definition="bold" table="yes" more="no"%} -{% include /trading_system/time-frame.md heading="##" icon="150-" adding="###" configuring="###" %} +{% include /trading_system/time-range.md heading="##" icon="150-" adding="###" configuring="###" starting="" content="yes" definition="bold" table="yes" more="no"%} -{% include /trading_system/time-range.md heading="##" icon="150-" adding="###" configuring="###" %} +{% include /trading_system/slippage.md heading="##" icon="150-" adding="###" configuring="###" starting="" content="yes" definition="bold" table="yes" more="no"%} -{% include /trading_system/slippage.md heading="##" icon="150-" adding="###" configuring="###" %} +{% include /trading_system/fee-structure.md heading="##" icon="150-" adding="###" configuring="###" starting="" content="yes" definition="bold" table="yes" more="no"%} -{% include /trading_system/fee-structure.md heading="##" icon="150-" adding="###" configuring="###" %} +{% include /trading_system/strategy.md heading="##" icon="150-" adding="###" configuring="" starting="" content="yes" definition="bold" table="yes" more="no"%} -{% include /trading_system/strategy.md heading="##" icon="150-" adding="###" configuring="" %} +{% include /trading_system/trigger-stage.md heading="##" icon="150-" adding="###" configuring="" starting="" content="yes" definition="bold" table="yes" more="no"%} -{% include /trading_system/trigger-stage.md heading="##" icon="150-" adding="###" configuring="" %} +{% include /trading_system/trigger-on-event.md heading="##" icon="150-" adding="###" configuring="" starting="" content="yes" definition="bold" table="yes" more="no"%} -{% include /trading_system/trigger-on-event.md heading="##" icon="150-" adding="###" configuring="" %} +{% include /trading_system/situation.md heading="##" icon="150-" adding="###" configuring="" starting="" content="yes" definition="bold" table="yes" more="no"%} -{% include /trading_system/situation.md heading="##" icon="150-" adding="###" configuring="" %} +{% include /trading_system/condition.md heading="##" icon="150-" adding="###" configuring="" starting="" content="yes" definition="bold" table="yes" more="no"%} -{% include /trading_system/condition.md heading="##" icon="150-" adding="###" configuring="" %} +{% include /trading_system/trigger-off-event.md heading="##" icon="150-" adding="###" configuring="" starting="" content="yes" definition="bold" table="yes" more="no"%} -{% include /trading_system/trigger-off-event.md heading="##" icon="150-" adding="###" configuring="" %} +{% include /trading_system/take-position-event.md heading="##" icon="150-" adding="###" configuring="" starting="" content="yes" definition="bold" table="yes" more="no"%} -{% include /trading_system/take-position-event.md heading="##" icon="150-" adding="###" configuring="" %} - -{% include /trading_system/open-stage.md heading="##" icon="150-" adding="###" configuring="" %} +{% include /trading_system/open-stage.md heading="##" icon="150-" adding="###" configuring="" starting="" content="yes" definition="bold" table="yes" more="no"%} @@ -1005,7 +1004,7 @@ To add an initial definition node, select *Add Initial Definition* on the open s -{% include /trading_system/initial-stop.md heading="##" icon="150-" adding="###" configuring="" %} +{% include /trading_system/initial-stop.md heading="##" icon="150-" adding="###" configuring="" starting="" content="yes" definition="bold" table="yes" more="no"%} @@ -1029,7 +1028,7 @@ To add the phase 0 node, select *Add Phase* on the initial definitions node menu -{% include /trading_system/formula.md heading="##" icon="150-" adding="###" configuring="" %} +{% include /trading_system/formula.md heading="##" icon="150-" adding="###" configuring="" starting="" content="yes" definition="bold" table="yes" more="no"%} @@ -1054,11 +1053,11 @@ To add a next phase event, select *Add Next Phase Event* on the corresponding ph -{% include /trading_system/initial-take-profit.md heading="##" icon="150-" adding="###" configuring="" %} +{% include /trading_system/initial-take-profit.md heading="##" icon="150-" adding="###" configuring="" starting="" content="yes" definition="bold" table="yes" more="no"%} -{% include /trading_system/position-size.md heading="##" icon="150-" adding="###" configuring="" %} +{% include /trading_system/position-size.md heading="##" icon="150-" adding="###" configuring="" starting="" content="yes" definition="bold" table="yes" more="no"%} -{% include /trading_system/position-rate.md heading="##" icon="150-" adding="###" configuring="" %} +{% include /trading_system/position-rate.md heading="##" icon="150-" adding="###" configuring="" starting="" content="yes" definition="bold" table="yes" more="no"%} @@ -1083,7 +1082,7 @@ To add an open execution node, select *Add Open Execution* on the open stage nod -{% include /trading_system/manage-stage.md heading="##" icon="150-" adding="###" configuring="" %} +{% include /trading_system/manage-stage.md heading="##" icon="150-" adding="###" configuring="" starting="" content="yes" definition="bold" table="yes" more="no"%} @@ -1141,7 +1140,7 @@ To add a take profit node, select *Add Missing Items* on the manage stage node m -{% include /trading_system/close-stage.md heading="##" icon="150-" adding="###" configuring="" %} +{% include /trading_system/close-stage.md heading="##" icon="150-" adding="###" configuring="" starting="" content="yes" definition="bold" table="yes" more="no"%}