-
diff --git a/Lab-1/script.js b/Set-Algebra/script.js
similarity index 58%
rename from Lab-1/script.js
rename to Set-Algebra/script.js
index 1e93cb4..204ac11 100644
--- a/Lab-1/script.js
+++ b/Set-Algebra/script.js
@@ -8,15 +8,10 @@ function AddSet() {
let charNum = 65 + currNum;
currNum++;
- let delBtn = document.querySelectorAll('#delBtn');
- if (delBtn[delBtn.length - 1]) {
- delBtn[delBtn.length - 1].style = "display: none;";
- }
-
node = document.getElementById('sets');
node.insertAdjacentHTML('beforeend', `
`);
} else {
@@ -24,28 +19,10 @@ function AddSet() {
}
}
-function DeleteSet(setNum) {
-
- let setField = document.querySelector(`#setfield${setNum}`);
- setField.remove();
- currNum--;
-
- let delBtn = document.querySelectorAll('#delBtn');
- if (delBtn[delBtn.length - 1]) {
- delBtn[delBtn.length - 1].style = "display: inline-block;";
- }
-}
-
-
let universalSet = new Set();
function Complement(set) {
-
- let _complement = new Set();
-
- _complement = Difference(universalSet, set);
-
- return _complement;
+ return (checkEmpty(set)) ? universalSet : Difference(universalSet, set);
}
function Intersection(set1, set2) {
@@ -58,7 +35,7 @@ function Intersection(set1, set2) {
}
});
- return _intersection;
+ return sortSet(_intersection);
}
function Union(set1, set2) {
@@ -69,7 +46,7 @@ function Union(set1, set2) {
_union.add(element);
});
- return _union;
+ return sortSet(_union);
}
function Difference(set1, set2) {
@@ -83,9 +60,20 @@ function Difference(set1, set2) {
}
});
- return _difference;
+ return sortSet(_difference);
}
+function sortSet(set) {
+ let entries = [];
+ for (let member of set) {
+ entries.push(+member);
+ }
+ set.clear();
+ for (let entry of entries.sort((a, b) => a - b)) {
+ set.add(entry);
+ }
+ return set;
+};
const OPERATORS = new Set(['~', '!', '∩', '/', '∪', '+', '-']);
const BRACKETS = new Set(['(', ')']);
@@ -93,7 +81,11 @@ const BRACKETS = new Set(['(', ')']);
let SETSNAMES = new Set();
let SETS = new Array();
-function Evaluate() {
+function Evaluate(hide = false) {
+ if (hide == true) {
+ let stepByStep = document.getElementById('stepByStep');
+ stepByStep.classList.add('hide');
+ }
FetchSets();
@@ -106,11 +98,9 @@ function Evaluate() {
let readableResult = ConvertToReadableResult(result);
-
let resultField = document.getElementById('result');
resultField.value = readableResult;
-
SETSNAMES.clear();
SETS = new Array();
universalSet = new Set();
@@ -187,9 +177,9 @@ function SolveRPNFormula(RPN_Array) {
if (element == '~' || element == '!') {
let currSet = stack.pop();
-
let result = Complement(currSet);
+ printStep('!', currSet, '', result);
stack.push(result);
} else if (element == '∩' || element == '/') {
@@ -198,6 +188,7 @@ function SolveRPNFormula(RPN_Array) {
let result = Intersection(firstSet, secondSet);
+ printStep('/', firstSet, secondSet, result);
stack.push(result);
} else if (element == '∪' || element == '+') {
@@ -206,6 +197,7 @@ function SolveRPNFormula(RPN_Array) {
let result = Union(firstSet, secondSet);
+ printStep('+', firstSet, secondSet, result);
stack.push(result);
} else if (element == '-') {
@@ -214,10 +206,10 @@ function SolveRPNFormula(RPN_Array) {
let result = Difference(firstSet, secondSet);
+ printStep('-', firstSet, secondSet, result);
stack.push(result);
}
} else {
-
stack.push(element);
}
}
@@ -225,8 +217,6 @@ function SolveRPNFormula(RPN_Array) {
return stack[0];
}
-
-
function FetchSets() {
let universalArray = new Array();
@@ -250,22 +240,18 @@ function FetchSets() {
});
SETSNAMES.add(String.fromCharCode(65 + i));
- SETS.push(newSet);
+ SETS.push(sortSet(newSet));
} else {
- console.log('[WARNING] Some of the sets are not defined');
+ SETS.push(new Set());
}
}
- universalSet = new Set(universalArray);
+ universalSet = sortSet(new Set(universalArray));
}
-
-
function GetSetFromIndex(index) {
-
let unicode = index.charCodeAt(0);
-
let num = unicode - 65;
return SETS[num];
@@ -289,7 +275,97 @@ function GetActionPriority(action) {
}
function ConvertToReadableResult(unconverted) {
+ return (checkEmpty(unconverted)) ? "Empty Set" : Array.from(unconverted).sort((a, b) => a - b).join(', ');
+}
- let converted = Array.from(unconverted).sort().join(', ');
- return converted;
+function checkEmpty(set) {
+ return (set == undefined || set.size == 0) ? true : false;
+}
+
+//----------------------------- Step by Step ---------------------------
+
+function stepByStep() {
+ let stepByStep = document.getElementById('stepByStep');
+ let clear = document.getElementById('steps');
+ clear.remove();
+
+ step = 0;
+ stepByStep.classList.remove('hide');
+ stepByStep.insertAdjacentHTML('beforeend', `
+
Step by step
+ `);
+ Evaluate();
+}
+
+let step = 0;
+
+function printStep(operation, firstSet, secondSet, result) {
+ step++;
+
+ let str = '';
+ switch (operation) {
+ case '!':
+ str = `!${setToString(firstSet)} = ${setToString(result)}`;
+ break;
+
+ case '/':
+ str = `${setToString(firstSet)} / ${setToString(secondSet)} = ${setToString(result)}`;
+ break;
+
+ case '+':
+ str = `${setToString(firstSet)} + ${setToString(secondSet)} = ${setToString(result)}`;
+ break;
+
+ case '-':
+ str = `${setToString(firstSet)} - ${setToString(secondSet)} = ${setToString(result)}`;
+ break;
+
+ default:
+ break;
+ }
+
+ let steps = document.getElementById('steps');
+ steps.insertAdjacentHTML('beforeend', `
`);
+}
+
+function setToString(set) {
+ let str = '';
+ if (checkEmpty(set)) {
+ return '{ Empty Set }'
+ } else {
+ for (let num of set) {
+ str += ', ' + num;
+ }
+ }
+ return '{ ' + str.slice(2, str.length) + ' }';
+}
+
+
+//----------------------------- Check Input ---------------------------
+
+const symbols = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'Backspace', 'ArrowLeft', 'ArrowRight', 'Delete'];
+
+function checkInputSet(key, value) {
+ if (value[value.length - 1] == ',' && symbols.indexOf(key) !== -1) {
+ return true;
+ } else if (symbols.indexOf(value[value.length - 1]) !== -1 && key == ',') {
+ return true;
+ } else if (symbols.indexOf(key) !== -1) {
+ return true;
+ } else {
+ return false;
+ }
+}
+
+const symbols2 = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K',
+ 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V',
+ 'W', 'X', 'Y', 'Z', 'Backspace', 'ArrowLeft', 'ArrowRight', 'Delete',
+ '-', '+', '/', '!', '(', ')'
+];
+
+function checkInputProblem(key) {
+ return (symbols2.indexOf(key) != -1) ? true : false;
}
\ No newline at end of file
diff --git a/fonts/MyriadPro-Light.ttf b/fonts/MyriadPro-Light.ttf
new file mode 100644
index 0000000..e40ef34
Binary files /dev/null and b/fonts/MyriadPro-Light.ttf differ
diff --git a/fonts/MyriadPro-Light.woff b/fonts/MyriadPro-Light.woff
new file mode 100644
index 0000000..cc65345
Binary files /dev/null and b/fonts/MyriadPro-Light.woff differ
diff --git a/fonts/MyriadPro-Regular.woff b/fonts/MyriadPro-Regular.woff
new file mode 100644
index 0000000..4780932
Binary files /dev/null and b/fonts/MyriadPro-Regular.woff differ
diff --git a/img/Boolean-Algebra.png b/img/Boolean-Algebra.png
new file mode 100644
index 0000000..5dd962f
Binary files /dev/null and b/img/Boolean-Algebra.png differ
diff --git a/img/Set-Algebra.png b/img/Set-Algebra.png
new file mode 100644
index 0000000..460ba6f
Binary files /dev/null and b/img/Set-Algebra.png differ
diff --git a/index.html b/index.html
new file mode 100644
index 0000000..35c3028
--- /dev/null
+++ b/index.html
@@ -0,0 +1,48 @@
+
+
+
+
+
+
+
+
+
CDM Calculator
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/style.css b/style.css
index c53a620..64175dd 100644
--- a/style.css
+++ b/style.css
@@ -3,6 +3,7 @@
margin: 0;
border: 0;
}
+
*,
*:before,
*:after {
@@ -82,8 +83,7 @@ h4,
h5,
h6 {
font-size: 18px;
- font-weight: 400;
- font-family: Roboto, sans-serif;
+ font-family: Myriad-L, sans-serif;
color: #fff;
line-height: 1.2;
}
@@ -92,7 +92,16 @@ a {
color: #fff;
}
-@import url('https://fonts.googleapis.com/css2?family=Roboto:wght@300;400;500;700&display=swap');
+@font-face {
+ font-family: Myriad-L;
+ src: url(fonts/MyriadPro-Light.ttf);
+}
+
+@font-face {
+ font-family: Myriad-R;
+ src: url(fonts/MyriadPro-Regular.woff);
+}
+
/* ------------------------------------------------------------------ */
@@ -100,6 +109,7 @@ h1 {
color: #fff;
margin: 0 auto;
margin-bottom: 10px;
+ letter-spacing: 0.75px;
}
h6 {
@@ -108,6 +118,10 @@ h6 {
text-align: center;
}
+h3 {
+ letter-spacing: 0.5px;
+}
+
h2 {
font-weight: 300;
}
@@ -192,6 +206,7 @@ body {
.text {
margin: auto 0;
white-space: pre;
+ letter-spacing: 0.75px;
}
.input {
@@ -206,7 +221,7 @@ input[type=value] {
border: 3px solid rgba(255, 255, 255, 0.2);
border-radius: 8px;
font-size: 18px;
- font-family: Roboto;
+ font-family: Myriad-R;
color: #fff;
margin: 5px auto;
padding: 0px 0px 0px 10px;
@@ -232,7 +247,13 @@ input[type=button] {
border-radius: 22px;
cursor: pointer;
font-size: 18px;
- font-family: Roboto;
+ font-family: Myriad-R;
+ transition: 1s;
+}
+
+input[type=button]:hover {
+ background-color: rgba(255, 255, 255, 0.7);
+ transition: 1s;
}
input[type=result] {
@@ -243,7 +264,7 @@ input[type=result] {
color: white;
border-radius: 8px;
font-size: 18px;
- font-family: Roboto;
+ font-family: Myriad-R;
cursor: default;
padding: 0px 0px 0px 10px;
}
@@ -256,7 +277,7 @@ input[type=result] {
::placeholder {
color: rgba(255, 255, 255, 0.35);
font-size: 18px;
- font-family: Roboto;
+ font-family: Myriad-R;
}
.addSet,
@@ -266,6 +287,7 @@ input[type=result] {
.buttons {
margin: 0 auto;
+ display: flex;
}
.button {
@@ -307,6 +329,38 @@ input[type=result] {
display: none;
}
+
+/* ------------------Main-------------- */
+
+.calculator {
+ display: flex;
+ flex-direction: column;
+ margin: 20px auto;
+ width: 90%;
+ max-width: 250px;
+ background-color: rgba(255, 255, 255, 0.3);
+ border-radius: 20px;
+ padding: 20px;
+ transition: 1s;
+}
+
+.calculator img {
+ height: 100px;
+ margin: 20px auto;
+}
+
+.calculator:hover {
+ background-color: rgba(255, 255, 255, 0.5);
+ transition: 1s;
+}
+
+.calculator h1 {
+ margin: 0 auto;
+ text-align: center;
+ font-size: 23px;
+ max-width: 200px;
+}
+
@media screen and (max-device-width: 650px) and (min-device-width: 0px) {
.wrapper {
flex-direction: column;
@@ -316,4 +370,11 @@ input[type=result] {
width: 85%;
margin: 20px auto;
}
+ .buttons {
+ flex-direction: column;
+ margin-top: 15px;
+ }
+ .button {
+ margin: 10px auto;
+ }
}
\ No newline at end of file
+ 
+