Skip to content

Commit

Permalink
Joining conflicts commits.
Browse files Browse the repository at this point in the history
  • Loading branch information
yurigabrich committed Sep 2, 2023
2 parents a7a0ac5 + 6adedee commit 7b2905e
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 50 deletions.
64 changes: 32 additions & 32 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,52 +9,52 @@
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL"
# name: "CodeQL"

on:
push:
branches: [ master ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ master ]
schedule:
- cron: '26 7 * * 1'
# on:
# push:
# branches: [ master ]
# pull_request:
# # The branches below must be a subset of the branches above
# branches: [ master ]
# schedule:
# - cron: '26 7 * * 1'

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write
# jobs:
# analyze:
# name: Analyze
# runs-on: ubuntu-latest
# permissions:
# actions: read
# contents: read
# security-events: write

strategy:
fail-fast: false
matrix:
language: [ 'csharp' ]
# strategy:
# fail-fast: false
# matrix:
# language: [ 'csharp' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
# Learn more:
# https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed

steps:
- name: Checkout repository
uses: actions/checkout@v2
# steps:
# - name: Checkout repository
# uses: actions/checkout@v2

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: ${{ matrix.language }}
# - name: Initialize CodeQL
# uses: github/codeql-action/init@v1
# with:
# languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1
# - name: Autobuild
# uses: github/codeql-action/autobuild@v1

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -67,5 +67,5 @@ jobs:
# make bootstrap
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
# - name: Perform CodeQL Analysis
# uses: github/codeql-action/analyze@v1
30 changes: 15 additions & 15 deletions docs/docs/documentation/struct.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ while the remaining functions (dashed boxes) support all the operations needs.

<br>

![code structure](https://github.com/yurigabrich/microgrid-dapp/blob/master/pseudo-code/imgs/struct.png)
![code structure](https://github.com/yurigabrich/microgrid-dapp/raw/master/pseudo-code/imgs/struct.png)
*The structure of the MTEsm code. [(GABRICH, 2019, figure 5)](microgrid-dapp/docs/references)*

<br>
Expand All @@ -36,7 +36,7 @@ Then, the remaining operation continues in the following figures, according to o

<br>

![main interface](https://github.com/yurigabrich/microgrid-dapp/blob/master/pseudo-code/imgs/main-interface.png)
![main interface](https://github.com/yurigabrich/microgrid-dapp/raw/master/pseudo-code/imgs/main-interface.png)
*The flowchart of the MTEsm main interface. [(GABRICH, 2019, figure 6)](microgrid-dapp/docs/references)*

<br>
Expand All @@ -56,7 +56,7 @@ she/he gains access to other functions only belonging to the group private envir

<br>

![figure 7](https://github.com/yurigabrich/microgrid-dapp/blob/master/pseudo-code/imgs/fig7.png)
![figure 7](https://github.com/yurigabrich/microgrid-dapp/raw/master/pseudo-code/imgs/fig7.png)
*The pathway to be accepted in a group's private environment. Functions (b) and (c) complements the whole process presented on (a). [(GABRICH, 2019, figure 7)](microgrid-dapp/docs/references)*

<br>
Expand All @@ -69,10 +69,10 @@ However, everyone can get information of the power plants and referendums status

<br>

![figure 8](https://github.com/yurigabrich/microgrid-dapp/blob/master/pseudo-code/imgs/fig8.png)
![figure 8](https://github.com/yurigabrich/microgrid-dapp/raw/master/pseudo-code/imgs/fig8.png)
*The process to get information from the group. Function (b) complements the whole process presented on (a), while (c) is one of the respective steps of (b), that continues in the next figure. [(GABRICH, 2019, figure 8)](microgrid-dapp/docs/references)*

![figure 9](https://github.com/yurigabrich/microgrid-dapp/blob/master/pseudo-code/imgs/fig9.png)
![figure 9](https://github.com/yurigabrich/microgrid-dapp/raw/master/pseudo-code/imgs/fig9.png)
*Flowcharts (a) and (b) complement the respective steps presented in the figure above. [(GABRICH, 2019, figure 9)](microgrid-dapp/docs/references)*

<br>
Expand All @@ -86,7 +86,7 @@ Thefore, only positive votes are counted and absence votes are weighted as negat

<br>

![figure 10](https://github.com/yurigabrich/microgrid-dapp/blob/master/pseudo-code/imgs/fig10.png)
![figure 10](https://github.com/yurigabrich/microgrid-dapp/raw/master/pseudo-code/imgs/fig10.png)
*A general voting procedure called by a member. Function (b) complements the whole process presented on (a). Note that the return argument of (b) means the success of the ballot, and not the vote answer. [(GABRICH, 2019, figure 10)](microgrid-dapp/docs/references)*

<br>
Expand All @@ -100,7 +100,7 @@ In the end, all information for this kind of crowdfunding keep recorded forever

<br>

![figure 11](https://github.com/yurigabrich/microgrid-dapp/blob/master/pseudo-code/imgs/fig11.png)
![figure 11](https://github.com/yurigabrich/microgrid-dapp/raw/master/pseudo-code/imgs/fig11.png)
*The process of a new power plant crowdfunding. Function (b) complements the whole process presented on (a). [(GABRICH, 2019, figure 11)](microgrid-dapp/docs/references)*

<br>
Expand All @@ -120,16 +120,16 @@ not of the single value of a power plant capacity.

<br>

![figure 12](https://github.com/yurigabrich/microgrid-dapp/blob/master/pseudo-code/imgs/fig12.png)
![figure 12](https://github.com/yurigabrich/microgrid-dapp/raw/master/pseudo-code/imgs/fig12.png)
*The full updating process of several information. Further details in the next figures. [(GABRICH, 2019, figure 12)](microgrid-dapp/docs/references)*

![figure 13](https://github.com/yurigabrich/microgrid-dapp/blob/master/pseudo-code/imgs/fig13.png)
![figure 13](https://github.com/yurigabrich/microgrid-dapp/raw/master/pseudo-code/imgs/fig13.png)
*Function (a) complements the process presented in the figure before, while (b) and (c) complement the final steps of (a). Although both have different outcomes, they share a common pattern such as one option to update data without group consensus. [(GABRICH, 2019, figure 13)](microgrid-dapp/docs/references)*

![figure 14](https://github.com/yurigabrich/microgrid-dapp/blob/master/pseudo-code/imgs/fig14.png)
![figure 14](https://github.com/yurigabrich/microgrid-dapp/raw/master/pseudo-code/imgs/fig14.png)
*The step (b) intermediates the referendum succeess in the function (a) and the final steps reproduced in the next figure. [(GABRICH, 2019, figure 14)](microgrid-dapp/docs/references)*

![figure 15](https://github.com/yurigabrich/microgrid-dapp/blob/master/pseudo-code/imgs/fig15.png)
![figure 15](https://github.com/yurigabrich/microgrid-dapp/raw/master/pseudo-code/imgs/fig15.png)
*The end of the update process accordingly with each proposal identified in the figure above, item (b). [(GABRICH, 2019, figure 15)](microgrid-dapp/docs/references)*

<br>
Expand Down Expand Up @@ -157,13 +157,13 @@ Therefore, the last step of the power-up function is a transaction that distribu

<br>

![figure 16](https://github.com/yurigabrich/microgrid-dapp/blob/master/pseudo-code/imgs/fig16.png)
![figure 16](https://github.com/yurigabrich/microgrid-dapp/raw/master/pseudo-code/imgs/fig16.png)
*The process to increase the group power capacity starts here. Functions (b) and (c) complement the whole process presented on (a). [(GABRICH, 2019, figure 16)](microgrid-dapp/docs/references)*

![figure 17](https://github.com/yurigabrich/microgrid-dapp/blob/master/pseudo-code/imgs/fig17.png)
![figure 17](https://github.com/yurigabrich/microgrid-dapp/raw/master/pseudo-code/imgs/fig17.png)
*The steps (a) and (b) complement the initial operations in item (c) of the figure before. [(GABRICH, 2019, figure 17)](microgrid-dapp/docs/references)*

![figure 18](https://github.com/yurigabrich/microgrid-dapp/blob/master/pseudo-code/imgs/fig18.png)
![figure 18](https://github.com/yurigabrich/microgrid-dapp/raw/master/pseudo-code/imgs/fig18.png)
*The analysis of the power plant (PP) operation status complements the last step in item (c) of the first figure of this workflow. [(GABRICH, 2019, figure 18)](microgrid-dapp/docs/references)*

<br>
Expand All @@ -183,7 +183,7 @@ In the end, to keep the group transparency about the quota shares, the MTEsm out

<br>

![figure 19](https://github.com/yurigabrich/microgrid-dapp/blob/master/pseudo-code/imgs/fig19.png)
![figure 19](https://github.com/yurigabrich/microgrid-dapp/raw/master/pseudo-code/imgs/fig19.png)
*The trade agreement process between members. Function (b) complements the process (a). [(GABRICH, 2019, figure 19)](microgrid-dapp/docs/references)*

<br>
6 changes: 3 additions & 3 deletions docs/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 7b2905e

Please sign in to comment.