From 5fcc2d75dd6e2b0edbaddf6509cbd371bda03ba8 Mon Sep 17 00:00:00 2001 From: FTS427 Date: Sat, 18 Nov 2023 21:49:49 +0800 Subject: [PATCH 01/12] D | CI unsupport MacOS --- .github/workflows/stable-build.yml | 15 +- src/{Stable => }/ECPPH.h | 0 src/{Stable => }/MCT-Linux | Bin src/{Stable => }/MCT-Linux.cpp | 0 src/{Stable => }/MCT-Windows.cpp | 0 src/{Stable => }/Makefile | 0 src/Preview/head/ECPPH.h | 93 ---------- src/Preview/linux/MCT-Linux-Pre | Bin 33288 -> 0 bytes src/Preview/linux/MCT-Linux-Pre.cpp | 251 --------------------------- src/Preview/linux/Makefile | 2 - src/Preview/win/MCT-Windows-Pre.cpp | 254 ---------------------------- 11 files changed, 1 insertion(+), 614 deletions(-) rename src/{Stable => }/ECPPH.h (100%) rename src/{Stable => }/MCT-Linux (100%) rename src/{Stable => }/MCT-Linux.cpp (100%) rename src/{Stable => }/MCT-Windows.cpp (100%) rename src/{Stable => }/Makefile (100%) delete mode 100644 src/Preview/head/ECPPH.h delete mode 100755 src/Preview/linux/MCT-Linux-Pre delete mode 100644 src/Preview/linux/MCT-Linux-Pre.cpp delete mode 100644 src/Preview/linux/Makefile delete mode 100644 src/Preview/win/MCT-Windows-Pre.cpp diff --git a/.github/workflows/stable-build.yml b/.github/workflows/stable-build.yml index 5b16370..cb73f1a 100644 --- a/.github/workflows/stable-build.yml +++ b/.github/workflows/stable-build.yml @@ -20,20 +20,7 @@ jobs: with: name: MCT-Linux path: src/Stable/MCT-Linux - - macos: - runs-on: macos-latest - steps: - - uses: actions/checkout@v3 - - name: build-macos - run: make - working-directory: src/Stable - - name: Build MCT-Macos - uses: actions/upload-artifact@v3.1.2 - with: - name: MCT-Macos - path: src/Stable/MCT-Linux - + windows: runs-on: windows-latest steps: diff --git a/src/Stable/ECPPH.h b/src/ECPPH.h similarity index 100% rename from src/Stable/ECPPH.h rename to src/ECPPH.h diff --git a/src/Stable/MCT-Linux b/src/MCT-Linux similarity index 100% rename from src/Stable/MCT-Linux rename to src/MCT-Linux diff --git a/src/Stable/MCT-Linux.cpp b/src/MCT-Linux.cpp similarity index 100% rename from src/Stable/MCT-Linux.cpp rename to src/MCT-Linux.cpp diff --git a/src/Stable/MCT-Windows.cpp b/src/MCT-Windows.cpp similarity index 100% rename from src/Stable/MCT-Windows.cpp rename to src/MCT-Windows.cpp diff --git a/src/Stable/Makefile b/src/Makefile similarity index 100% rename from src/Stable/Makefile rename to src/Makefile diff --git a/src/Preview/head/ECPPH.h b/src/Preview/head/ECPPH.h deleted file mode 100644 index 4d37c49..0000000 --- a/src/Preview/head/ECPPH.h +++ /dev/null @@ -1,93 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -using namespace std; - -int error(){ - printf("\033[1,31mERROR!\033[0m\a\n"); - return 1; -} - -void clear(){ - printf("\033[2J"); - printf("\033[0,0"); -} - -void print(const char T[],string color,bool i){ - if(i==true){ - if(color=="none") - cout<0){ - while(l>1){ - print(S,color,false); - l--; - } - print(S,color,i); - } - error; -} - -void dash(const char T[]){ - cout<<" - "< 0){ - print("+",bc,false); - line("-",l+2,bc,false); - print("+",bc,true); - print("| ",bc,false); - print(T,tc,false); - print(" |",bc,true); - print("+",bc,false); - line("-",l+2,bc,false); - print("+",bc,i); - } - error; -} diff --git a/src/Preview/linux/MCT-Linux-Pre b/src/Preview/linux/MCT-Linux-Pre deleted file mode 100755 index daad2fb2b88447b85b75c2171dbc759bd8af7b8e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 33288 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 F{WpYALB9Y1 diff --git a/src/Preview/linux/MCT-Linux-Pre.cpp b/src/Preview/linux/MCT-Linux-Pre.cpp deleted file mode 100644 index 184b115..0000000 --- a/src/Preview/linux/MCT-Linux-Pre.cpp +++ /dev/null @@ -1,251 +0,0 @@ -//此版本为Preview测试版，有不稳定功能和不完整功能 - -#include "../head/ECPPH.h" -#include -char q; - -void hy(const char T[]){cout<<"欢迎使用"<> num1 >> o >> num2; - //加 - if (o == '+') - printf("%f+%f=%f\n",num1,num2,num1+num2); - //减 - if (o == '-') - printf("%f-%f=%f\n",num1,num2,num1-num2); - //乘 - if (o == '*') - printf("%f*%f=%f\n",num1,num2,num1*num2); - //除 - if (o == '/'){ - if (num2 != 0) - printf("%f/%f=%f\n",num1,num2,num1/num2); - else - error(); - } - //乘方 - /* - if (o == '^') { - int n=num2; - if(num1 != 0 && num2 != 0){ - num3 = 1; - while(n > 0) { - int(num1)*int(num3)=num3; - n--; - } - } - else - error(); - printf("%f^%f=%f\n",num1,num2,num3); - } - */ - //退出 - if(o == 'c' && num1 == 0 && num2 ==0){ - clear(); - break; - } - //报错 - else - error(); - } -} - -//B函数,计算最大公约数 -void B(){ - clear(); - double num3, num4; - hy("最大公约数"); - print("\033[1;43;37m注意\033[0m：本功能只支持两个数之间的运算！","no",true); - while(true){ - line("-",20,"yellow",true); - print("输入任意值继续，输入\033[33;1mC\033[0m退出...","no",true); - cin >> q; - if(q == 'c' || q == 'C'){ - clear(); - break; - } - else{ - print("请输入第一个数:","white",true); - cin >> num3; - print("请输入第二个数:","white",true); - cin >> num4; - num3 = abs(num3); - num4 = abs(num4); - while (num3 != num4){ - if (num3 > num4) - num3 -= num4; - else - num4 -= num3; - } - cout << "这两个数的的最大公约数是: " << num3 + num4 << endl; - } - } -} - -//C函数,计算最小公倍数 -void C(){ - clear(); - hy("最小公倍数"); - print("\033[1;43;37m注意\033[0m：本功能只支持两个数之间的运算!","no",true); - while(true){ - line("-",20,"yellow",true); - print("输入任意值继续，输入\033[33;1mC\033[0m退出...","no",true); - cin >> q; - if(q == 'c' || q == 'C'){ - clear(); - break; - } - else{ - int n3; - double num5, num6; - while (true){ - print("请输入第一个数:","white",true); - cin >> num5; - print("请输入第二个数:","white",true); - cin >> num6; - if (num5 != int(num5) || num6 != int(num6)) - error(); - else - break; - } - n3 = (num5 > num6) ? num5 : num6; - while (true){ - if (n3 % int(num5) == 0 && n3 % int(num6) == 0){ - cout << "这两个数的的最小公倍数是：" << n3 << endl; - break; - } - else - ++n3; - } - } - } -} - - -//D函数,数值分析器 -void D(){ - clear(); - long double x, a; - hy("数值分析器"); - while(true){ - line("-",20,"yellow",true); - print("输入任意值继续，输入\033[1;33mC\033[0m退出...","no",true); - cin >> q; - if (q == 'c' || q == 'C'){ - clear(); - break; - } - else{ - print("请输入一个数:","blue",true); - cin >> x; - if (x == 0){ - cout << x << "是整数" << endl; - cout << x << "是正数" << endl; - cout << x << "不分质数合数" << endl; - cout << x << "是偶数" << endl; - } - else{ - if (modf(x, &a) == 0.0) - cout << x << "是整数" << endl; - else - cout << x << "是分数" << endl; - if (x > 0) - cout << x << "是正数" << endl; - else - cout << x << "是负数" << endl; - if (x == 1) - cout << x << "不分质数合数" << endl; - if (int(x) - x != 0) - cout << x << "不分质数合数" << endl; - else{ - int n=0, i; - for(i=2;i0) - cout << x << "是合数" << endl; - cout << x << "是质数" << endl; - } - if (int(x) == x){ - if (int(x) % 2 == 0) - cout << x << "是偶数" << endl; - cout << x << "是奇数" << endl; - } - else{ - if (x/2 - int(x)/2 == 0) - cout << x << "是偶数" << endl; - cout << x << "是奇数" << endl; - } - } - } - } -} -/* -//E函数,几何计算 -void E(){ - hy("几何计算"); - while(true){ - line("-",20,"yellow",true); - print("输入任意键继续，输入“\033[1;33mc\033[0m”退出...","no",true); - cin >> q; - if (q == 'c' || q == 'C'){ - clear(); - break; - } - else{ - //矩形 梯形 三角形 圆 面积,周长,体积 - } - } -} -*/ -//主函数 -int main(){ - clear(); - hy("集成数学工具"); - char u; - while(true){ - line("-",20,"yellow",true); - dash("\033[1;34m(1)\033[34m计算器\033[0m"); - dash("\033[1;35m(2)\033[35m最大公约数\033[0m"); - dash("\033[1;36m(3)\033[36m最小公倍数\033[0m"); - dash("\033[1;32m(4)\033[32m数值分析器\033[0m"); - dash("\033[1;33m(5)\033[33m几何\033[0m"); - dash("\033[0m(a)关于\033[0m"); - dash("\033[1;33m(e)退出\033[0m"); - print("请键入所需功能：","white",false); - cin >> u; - if (u=='1') - calc(); - if (u=='2') - B(); - if (u=='3') - C(); - if (u=='4') - D(); -//if (u=='5')E(); - if (u=='E'||u=='e') - break; - if (u=='A'||u =='a'){ - clear(); - line("=",20,"blue",true); - dash("MCT Preview v0.0.1.3-2"); - dash("Made by QuantumLS-Studio"); - dash("Github:https://github.com/QuantumLS-Studio/MathCentralTool"); - line("=",20,"blue",true); - } - else - error(); - } - return 0; -} diff --git a/src/Preview/linux/Makefile b/src/Preview/linux/Makefile deleted file mode 100644 index 6e8aa9c..0000000 --- a/src/Preview/linux/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -MCT-Linux-Pre-Build: MCT-Linux-Pre.cpp - g++ MCT-Linux-Pre.cpp -o MCT-Linux-Pre diff --git a/src/Preview/win/MCT-Windows-Pre.cpp b/src/Preview/win/MCT-Windows-Pre.cpp deleted file mode 100644 index 4d8435f..0000000 --- a/src/Preview/win/MCT-Windows-Pre.cpp +++ /dev/null @@ -1,254 +0,0 @@ -//此版本为Preview测试版，有不稳定功能和不完整功能 - -#include "ECPPH.h" - -char q; - -void hy(const char T[]){cout<<"欢迎使用"<> num1 >> o >> num2; - //加 - if (o == '+') - cout << num1 << "+" << num2 << "=" << num1 + num2 << endl; - //减 - else if (o == '-') - cout << num1 << "-" << num2 << "=" << num1 - num2 << endl; - //乘 - else if (o == '*') - cout << num1 << "*" << num2 << "=" << num1 * num2 << endl; - //除 - else if (o == '/'){ - if (num2 == 0) - error(); - else - cout << num1 << "/" << num2 << "=" << num1/num2 << endl; - } - //乘方 - else if (o == '^') { - int n=num2; - if (num1 == 0 && num2 == 0) - error(); - else { - num3 = 1; - while (num2 > 0) { - num3 *= num1; - num2--; - } - } - cout << num1 << "^" << n << "=" << num3 << endl; - } - //退出 - else if(o == 'c' && num1 == 0 && num2 ==0){ - clear(1); - break; - } - //报错 - else - error(); - } -} - -//B函数,计算最大公约数 -void B(){ - clear(1); - double num3, num4; - hy("最大公约数"); - print("\033[1;43;37m注意\033[0m：本功能只支持两个数之间的运算！","no",true); - while(true){ - line("-",20,"yellow"); - print("输入任意值继续，输入\033[33;1mC\033[0m退出...","no",true); - cin >> q; - if(q == 'c' || q == 'C'){ - clear(1); - break; - } - else{ - print("请输入第一个数:","white",true); - cin >> num3; - print("请输入第二个数:","white",true); - cin >> num4; - num3 = abs(num3); - num4 = abs(num4); - while (num3 != num4){ - if (num3 > num4) - num3 -= num4; - else - num4 -= num3; - } - cout << "这两个数的的最大公约数是: " << num3 + num4 << endl; - } - } -} - -//C函数,计算最小公倍数 -void C(){ - clear(1); - hy("最小公倍数"); - print("\033[1;43;37m注意\033[0m：本功能只支持两个数之间的运算!","no",true); - while(true){ - line("-",20,"yellow"); - print("输入任意值继续，输入\033[33;1mC\033[0m退出...","no",true); - cin >> q; - if(q == 'c' || q == 'C'){ - clear(1); - break; - } - else{ - int n3; - double num5, num6; - while (true){ - print("请输入第一个数:","white",true); - cin >> num5; - print("请输入第二个数:","white",true); - cin >> num6; - if (num5 != int(num5) || num6 != int(num6)) - error(); - else - break; - } - n3 = (num5 > num6) ? num5 : num6; - while (true){ - if (n3 % int(num5) == 0 && n3 % int(num6) == 0){ - cout << "这两个数的的最小公倍数是：" << n3 << endl; - break; - } - else - ++n3; - } - } - } -} - - -//D函数,数值分析器 -void D(){ - clear(1); - long double x, a; - hy("数值分析器"); - while(true){ - line("-",20,"yellow"); - print("输入任意值继续，输入\033[1;33mC\033[0m退出...","no",true); - cin >> q; - if (q == 'c' || q == 'C'){ - clear(1); - break; - } - else{ - print("请输入一个数:","blue",true); - cin >> x; - if (x == 0){ - cout << x << "是整数" << endl; - cout << x << "是正数" << endl; - cout << x << "不分质数合数" << endl; - cout << x << "是偶数" << endl; - } - else{ - if (modf(x, &a) == 0.0) - cout << x << "是整数" << endl; - else - cout << x << "是分数" << endl; - if (x > 0) - cout << x << "是正数" << endl; - else - cout << x << "是负数" << endl; - if (x == 1) - cout << x << "不分质数合数" << endl; - else if (int(x) - x != 0) - cout << x << "不分质数合数" << endl; - else{ - int n=0, i; - for(i=2;i0) - cout << x << "是合数" << endl; - else - cout << x << "是质数" << endl; - } - if (int(x) == x){ - if (int(x) % 2 == 0) - cout << x << "是偶数" << endl; - else - cout << x << "是奇数" << endl; - } - else{ - if (x/2 - int(x)/2 == 0) - cout << x << "是偶数" << endl; - else - cout << x << "是奇数" << endl; - } - } - } - } -} - -//E函数,几何计算 -void E(){ - hy("几何计算"); - while(true){ - line("-",20,"yellow"); - print("输入任意键继续，输入“\033[1;33mc\033[0m”退出...","no",true); - cin >> q; - if (q == 'c' || q == 'C'){ - clear(1); - break; - } - else{ - //矩形 梯形 三角形 圆 面积,周长,体积 - } - } -} - -//主函数 -int main(){ - clear(1); - hy("集成数学工具"); - char u; - while(true){ - line("-",20,"yellow"); - dash("\033[1;34m(1)\033[34m计算器\033[0m"); - dash("\033[1;35m(2)\033[35m最大公约数\033[0m"); - dash("\033[1;36m(3)\033[36m最小公倍数\033[0m"); - dash("\033[1;32m(4)\033[32m数值分析器\033[0m"); - dash("\033[1;33m(5)\033[33m几何\033[0m"); - dash("\033[0m(a)关于\033[0m"); - dash("\033[1;33m(e)退出\033[0m"); - print("请键入所需功能：","white",false); - cin >> u; - if (u=='1') - calc(); - else if (u=='2') - B(); - else if (u=='3') - C(); - else if (u=='4') - D(); - else if (u=='5') - E(); - else if (u=='E'||u=='e') - break; - else if (u=='A'||u =='a'){ - clear(1); - line("=",20,"blue"); - dash("MCT Preview v0.0.1.2-4"); - dash("Made by QuantumLS-Studio"); - dash("Github:https://github.com/QuantumLS-Studio/MathCentralTool"); - line("=",20,"blue"); - } - else - error(); - } - return 0; -} From 6b59c491951204a2f61f3aa522b4ea3a55738a3b Mon Sep 17 00:00:00 2001 From: FTS427 Date: Sat, 18 Nov 2023 21:58:07 +0800 Subject: [PATCH 02/12] C | change some in CI --- .github/workflows/stable-build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/stable-build.yml b/.github/workflows/stable-build.yml index cb73f1a..3736fbc 100644 --- a/.github/workflows/stable-build.yml +++ b/.github/workflows/stable-build.yml @@ -14,12 +14,12 @@ jobs: - uses: actions/checkout@v3 - name: build-linux run: make - working-directory: src/Stable + working-directory: src - name: Build MCT-Linux uses: actions/upload-artifact@v3.1.2 with: name: MCT-Linux - path: src/Stable/MCT-Linux + path: src/MCT-Linux windows: runs-on: windows-latest @@ -27,9 +27,9 @@ jobs: - uses: actions/checkout@v3 - name: build-windows run: g++ MCT-Windows.cpp -o MCT-Windows.exe - working-directory: src/Stable + working-directory: src - name: Build MCT-Windows uses: actions/upload-artifact@v3.1.2 with: name: MCT-Windows - path: src/Stable/MCT-Windows + path: src/MCT-Windows From c78500410fc7280eafe321c3ee6a6c209b680eef Mon Sep 17 00:00:00 2001 From: FTS427 Date: Sat, 30 Dec 2023 11:02:38 +0800 Subject: [PATCH 03/12] M | Merge --- src/ECPPH.h | 93 ------------------ src/MCT-Linux | Bin 33240 -> 0 bytes src/MCT-Linux.cpp | 232 -------------------------------------------- src/MCT-Windows.cpp | 232 -------------------------------------------- src/Makefile | 2 - 5 files changed, 559 deletions(-) delete mode 100644 src/ECPPH.h delete mode 100755 src/MCT-Linux delete mode 100644 src/MCT-Linux.cpp delete mode 100644 src/MCT-Windows.cpp delete mode 100644 src/Makefile diff --git a/src/ECPPH.h b/src/ECPPH.h deleted file mode 100644 index 9e61600..0000000 --- a/src/ECPPH.h +++ /dev/null @@ -1,93 +0,0 @@ -#include -#include -#include -#include -#include -#include -using namespace std; -//Easy C++ Head - -void error(){ - cout<<"\033[1,31mERROR!\033[0m\a\n"; -} - -void clear(int i){ - if(i==0) - system("clear"); - else if(i==1) - system("CLS"); - else - error(); -} - -void print(const char T[],string color,bool i){ - if(i==true){ - if(color=="no") - cout<1){ - print(S,color,false); - l--; - } - print(S,color,true); - } -} - -void dash(const char T[]){ - cout<<" - "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 diff --git a/src/MCT-Linux.cpp b/src/MCT-Linux.cpp deleted file mode 100644 index f5acc95..0000000 --- a/src/MCT-Linux.cpp +++ /dev/null @@ -1,232 +0,0 @@ -#include "ECPPH.h" - -char q; - -void hy(const char T[]){cout<<"欢迎使用"<> num1 >> o >> num2; - //加 - if (o == '+') - cout << num1 << "+" << num2 << "=" << num1 + num2 << endl; - //减 - else if (o == '-') - cout << num1 << "-" << num2 << "=" << num1 - num2 << endl; - //乘 - else if (o == '*') - cout << num1 << "*" << num2 << "=" << num1 * num2 << endl; - //除 - else if (o == '/'){ - if (num2 == 0) - error(); - else - cout << num1 << "/" << num2 << "=" << num1/num2 << endl; - } - //乘方 - else if (o == '^') { - int n=num2; - if (num1 == 0 && num2 == 0) - error(); - else { - num3 = 1; - while (num2 > 0) { - num3 *= num1; - num2--; - } - } - cout << num1 << "^" << n << "=" << num3 << endl; - } - //退出 - else if(o == 'c' && num1 == 0 && num2 ==0){ - clear(0); - break; - } - //报错 - else - error(); - } -} - -//B函数,计算最大公约数 -void B(){ - clear(0); - double num3, num4; - hy("最大公约数"); - print("\033[1;43;37m注意\033[0m：本功能只支持两个数之间的运算！","no",true); - while(true){ - line("-",20,"yellow"); - print("输入任意值继续，输入\033[33;1mC\033[0m退出...","no",true); - cin >> q; - if(q == 'c' || q == 'C'){ - clear(0); - break; - } - else{ - print("请输入第一个数:","white",true); - cin >> num3; - print("请输入第二个数:","white",true); - cin >> num4; - num3 = abs(num3); - num4 = abs(num4); - while (num3 != num4){ - if (num3 > num4) - num3 -= num4; - else - num4 -= num3; - } - cout << "这两个数的的最大公约数是: " << num3 + num4 << endl; - } - } -} - -//C函数,计算最小公倍数 -void C(){ - clear(0); - hy("最小公倍数"); - print("\033[1;43;37m注意\033[0m：本功能只支持两个数之间的运算!","no",true); - while(true){ - line("-",20,"yellow"); - print("输入任意值继续，输入\033[33;1mC\033[0m退出...","no",true); - cin >> q; - if(q == 'c' || q == 'C'){ - clear(0); - break; - } - else{ - int n3; - double num5, num6; - while (true){ - print("请输入第一个数:","white",true); - cin >> num5; - print("请输入第二个数:","white",true); - cin >> num6; - if (num5 != int(num5) || num6 != int(num6)) - error(); - else - break; - } - n3 = (num5 > num6) ? num5 : num6; - while (true){ - if (n3 % int(num5) == 0 && n3 % int(num6) == 0){ - cout << "这两个数的的最小公倍数是：" << n3 << endl; - break; - } - else - ++n3; - } - } - } -} - - -//D函数,数值分析器 -void D(){ - clear(0); - long double x, a; - hy("数值分析器"); - while(true){ - line("-",20,"yellow"); - print("输入任意值继续，输入\033[1;33mC\033[0m退出...","no",true); - cin >> q; - if (q == 'c' || q == 'C'){ - clear(0); - break; - } - else{ - print("请输入一个数:","blue",true); - cin >> x; - if (x == 0){ - cout << x << "是整数" << endl; - cout << x << "是正数" << endl; - cout << x << "不分质数合数" << endl; - cout << x << "是偶数" << endl; - } - else{ - if (modf(x, &a) == 0.0) - cout << x << "是整数" << endl; - else - cout << x << "是分数" << endl; - if (x > 0) - cout << x << "是正数" << endl; - else - cout << x << "是负数" << endl; - if (x == 1) - cout << x << "不分质数合数" << endl; - else if (int(x) - x != 0) - cout << x << "不分质数合数" << endl; - else{ - int n=0, i; - for(i=2;i0) - cout << x << "是合数" << endl; - else - cout << x << "是质数" << endl; - } - if (int(x) == x){ - if (int(x) % 2 == 0) - cout << x << "是偶数" << endl; - else - cout << x << "是奇数" << endl; - } - else{ - if (x/2 - int(x)/2 == 0) - cout << x << "是偶数" << endl; - else - cout << x << "是奇数" << endl; - } - } - } - } -} - -//主函数 -int main(){ - clear(0); - hy("集成数学工具"); - char u; - while(true){ - line("-",20,"yellow"); - dash("\033[1;34m(1)\033[34m计算器\033[0m"); - dash("\033[1;35m(2)\033[35m最大公约数\033[0m"); - dash("\033[1;36m(3)\033[36m最小公倍数\033[0m"); - dash("\033[1;32m(4)\033[32m数值分析器\033[0m"); - dash("\033[0m(a)关于\033[0m"); - dash("\033[1;33m(e)退出\033[0m"); - print("请键入所需功能：","white",false); - cin >> u; - if (u=='1') - calc(); - else if (u=='2') - B(); - else if (u=='3') - C(); - else if (u=='4') - D(); - else if (u=='E'||u=='e') - break; - else if (u=='A'||u =='a'){ - clear(0); - line("=",20,"blue"); - dash("MCT Stable v0.0.1.2"); - dash("Made by QuantumLS-Studio"); - dash("Github:https://github.com/QuantumLS-Studio/MathCentralTool"); - line("=",20,"blue"); - } - else - error(); - } - return 0; -} diff --git a/src/MCT-Windows.cpp b/src/MCT-Windows.cpp deleted file mode 100644 index ae58832..0000000 --- a/src/MCT-Windows.cpp +++ /dev/null @@ -1,232 +0,0 @@ -#include "ECPPH.h" - -char q; - -void hy(const char T[]){cout<<"欢迎使用"<> num1 >> o >> num2; - //加 - if (o == '+') - cout << num1 << "+" << num2 << "=" << num1 + num2 << endl; - //减 - else if (o == '-') - cout << num1 << "-" << num2 << "=" << num1 - num2 << endl; - //乘 - else if (o == '*') - cout << num1 << "*" << num2 << "=" << num1 * num2 << endl; - //除 - else if (o == '/'){ - if (num2 == 0) - error(); - else - cout << num1 << "/" << num2 << "=" << num1/num2 << endl; - } - //乘方 - else if (o == '^') { - int n=num2; - if (num1 == 0 && num2 == 0) - error(); - else { - num3 = 1; - while (num2 > 0) { - num3 *= num1; - num2--; - } - } - cout << num1 << "^" << n << "=" << num3 << endl; - } - //退出 - else if(o == 'c' && num1 == 0 && num2 ==0){ - clear(1); - break; - } - //报错 - else - error(); - } -} - -//B函数,计算最大公约数 -void B(){ - clear(1); - double num3, num4; - hy("最大公约数"); - print("\033[1;43;37m注意\033[0m：本功能只支持两个数之间的运算！","no",true); - while(true){ - line("-",20,"yellow"); - print("输入任意值继续，输入\033[33;1mC\033[0m退出...","no",true); - cin >> q; - if(q == 'c' || q == 'C'){ - clear(1); - break; - } - else{ - print("请输入第一个数:","white",true); - cin >> num3; - print("请输入第二个数:","white",true); - cin >> num4; - num3 = abs(num3); - num4 = abs(num4); - while (num3 != num4){ - if (num3 > num4) - num3 -= num4; - else - num4 -= num3; - } - cout << "这两个数的的最大公约数是: " << num3 + num4 << endl; - } - } -} - -//C函数,计算最小公倍数 -void C(){ - clear(1); - hy("最小公倍数"); - print("\033[1;43;37m注意\033[0m：本功能只支持两个数之间的运算!","no",true); - while(true){ - line("-",20,"yellow"); - print("输入任意值继续，输入\033[33;1mC\033[0m退出...","no",true); - cin >> q; - if(q == 'c' || q == 'C'){ - clear(1); - break; - } - else{ - int n3; - double num5, num6; - while (true){ - print("请输入第一个数:","white",true); - cin >> num5; - print("请输入第二个数:","white",true); - cin >> num6; - if (num5 != int(num5) || num6 != int(num6)) - error(); - else - break; - } - n3 = (num5 > num6) ? num5 : num6; - while (true){ - if (n3 % int(num5) == 0 && n3 % int(num6) == 0){ - cout << "这两个数的的最小公倍数是：" << n3 << endl; - break; - } - else - ++n3; - } - } - } -} - - -//D函数,数值分析器 -void D(){ - clear(1); - long double x, a; - hy("数值分析器"); - while(true){ - line("-",20,"yellow"); - print("输入任意值继续，输入\033[1;33mC\033[0m退出...","no",true); - cin >> q; - if (q == 'c' || q == 'C'){ - clear(1); - break; - } - else{ - print("请输入一个数:","blue",true); - cin >> x; - if (x == 0){ - cout << x << "是整数" << endl; - cout << x << "是正数" << endl; - cout << x << "不分质数合数" << endl; - cout << x << "是偶数" << endl; - } - else{ - if (modf(x, &a) == 0.0) - cout << x << "是整数" << endl; - else - cout << x << "是分数" << endl; - if (x > 0) - cout << x << "是正数" << endl; - else - cout << x << "是负数" << endl; - if (x == 1) - cout << x << "不分质数合数" << endl; - else if (int(x) - x != 0) - cout << x << "不分质数合数" << endl; - else{ - int n=0, i; - for(i=2;i0) - cout << x << "是合数" << endl; - else - cout << x << "是质数" << endl; - } - if (int(x) == x){ - if (int(x) % 2 == 0) - cout << x << "是偶数" << endl; - else - cout << x << "是奇数" << endl; - } - else{ - if (x/2 - int(x)/2 == 0) - cout << x << "是偶数" << endl; - else - cout << x << "是奇数" << endl; - } - } - } - } -} - -//主函数 -int main(){ - clear(1); - hy("集成数学工具"); - char u; - while(true){ - line("-",20,"yellow"); - dash("\033[1;34m(1)\033[34m计算器\033[0m"); - dash("\033[1;35m(2)\033[35m最大公约数\033[0m"); - dash("\033[1;36m(3)\033[36m最小公倍数\033[0m"); - dash("\033[1;32m(4)\033[32m数值分析器\033[0m"); - dash("\033[0m(a)关于\033[0m"); - dash("\033[1;33m(e)退出\033[0m"); - print("请键入所需功能：","white",false); - cin >> u; - if (u=='1') - calc(); - else if (u=='2') - B(); - else if (u=='3') - C(); - else if (u=='4') - D(); - else if (u=='E'||u=='e') - break; - else if (u=='A'||u =='a'){ - clear(1); - line("=",20,"blue"); - dash("MCT Stable v0.0.1.2"); - dash("Made by QuantumLS-Studio"); - dash("Github:https://github.com/QuantumLS-Studio/MathCentralTool"); - line("=",20,"blue"); - } - else - error(); - } - return 0; -} diff --git a/src/Makefile b/src/Makefile deleted file mode 100644 index cac51b9..0000000 --- a/src/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -MCT-Linux-Build: MCT-Linux.cpp ECPPH.h - g++ MCT-Linux.cpp -o MCT-Linux From aef0b8c888ab9fa32d6f9889e885234fd46b491d Mon Sep 17 00:00:00 2001 From: FTS427 Date: Sat, 13 Jan 2024 20:17:30 +0800 Subject: [PATCH 04/12] U | Update dir name --- src/include/ecp.h | 5 ++--- src/{plugins => module}/calc.cpp | 0 src/{plugins => module}/cg.cpp | 0 src/{plugins => module}/chn.cpp | 0 src/{plugins => module}/maxn.cpp | 0 src/{plugins => module}/minn.cpp | 0 6 files changed, 2 insertions(+), 3 deletions(-) rename src/{plugins => module}/calc.cpp (100%) rename src/{plugins => module}/cg.cpp (100%) rename src/{plugins => module}/chn.cpp (100%) rename src/{plugins => module}/maxn.cpp (100%) rename src/{plugins => module}/minn.cpp (100%) diff --git a/src/include/ecp.h b/src/include/ecp.h index 737efd7..fe128cc 100644 --- a/src/include/ecp.h +++ b/src/include/ecp.h @@ -6,9 +6,8 @@ #include using namespace std; -int error(){ - cout << "\033[1,31mERROR!\033[0m\a\n"; - return 1; +void error(){ + cout << "\033[1,31m"+"ERROR!"+"\033[0m\a\n"; } void clear(){system("clear");} diff --git a/src/plugins/calc.cpp b/src/module/calc.cpp similarity index 100% rename from src/plugins/calc.cpp rename to src/module/calc.cpp diff --git a/src/plugins/cg.cpp b/src/module/cg.cpp similarity index 100% rename from src/plugins/cg.cpp rename to src/module/cg.cpp diff --git a/src/plugins/chn.cpp b/src/module/chn.cpp similarity index 100% rename from src/plugins/chn.cpp rename to src/module/chn.cpp diff --git a/src/plugins/maxn.cpp b/src/module/maxn.cpp similarity index 100% rename from src/plugins/maxn.cpp rename to src/module/maxn.cpp diff --git a/src/plugins/minn.cpp b/src/module/minn.cpp similarity index 100% rename from src/plugins/minn.cpp rename to src/module/minn.cpp From c60c0d5f74a6cd70f671af111bf52e534b527b1b Mon Sep 17 00:00:00 2001 From: FTS427 Date: Sat, 13 Jan 2024 21:35:50 +0800 Subject: [PATCH 05/12] U | Rewriting calc --- src/include/ecp.h | 6 ++++-- src/main.cpp | 18 +++++++++++------- src/module/calc.cpp | 34 +++++++++++++++++++++++++++++++++- 3 files changed, 48 insertions(+), 10 deletions(-) diff --git a/src/include/ecp.h b/src/include/ecp.h index fe128cc..e9b0c95 100644 --- a/src/include/ecp.h +++ b/src/include/ecp.h @@ -4,10 +4,12 @@ #include #include #include +#include using namespace std; -void error(){ - cout << "\033[1,31m"+"ERROR!"+"\033[0m\a\n"; +int error(){ + printf("\033[1,31mERROR!\033[0m\a\n"); + return 0; } void clear(){system("clear");} diff --git a/src/main.cpp b/src/main.cpp index 6b31a63..2ff2b98 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,11 +1,11 @@ //Preview, be careful #include "./include/ecp.h" -#include "./plugins/calc.cpp" -#include "./plugins/maxn.cpp" -#include "./plugins/minn.cpp" -#include "./plugins/chn.cpp" -#include "./plugins/cg.cpp" +#include "./module/calc.cpp" +#include "./module/maxn.cpp" +#include "./module/minn.cpp" +#include "./module/chn.cpp" +#include "./module/cg.cpp" // Main function int main(){ @@ -22,8 +22,12 @@ int main(){ dash("\033[1;33m(e)退出\033[0m"); print("> ","white",false); cin >> q; - if (q=='1') - calc(); + if (q=='1'){ + int a,b; + char o; + cin >>a>>o>>b; + cout << calc(a,b,o) < Date: Sat, 13 Jan 2024 21:42:53 +0800 Subject: [PATCH 06/12] U | Update --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 141afa7..af96791 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ .vscode build - From 7e16708ee33f4a49aaef3ff2c09570e61864910c Mon Sep 17 00:00:00 2001 From: FTS427 Date: Sun, 14 Jan 2024 13:16:19 +0800 Subject: [PATCH 07/12] U | Update use --- .github/workflows/preview-build.yml | 4 ++-- README.md | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/preview-build.yml b/.github/workflows/preview-build.yml index 3994b6e..3daaee6 100644 --- a/.github/workflows/preview-build.yml +++ b/.github/workflows/preview-build.yml @@ -21,12 +21,12 @@ jobs: cmake ../ echo "Done!" shell: sh - - name: Make build + - name: Ninja build run: | cd ${{ github.workspace }} ls cd build - make + ninja echo "Done!" shell: sh - name: Upload exec file diff --git a/README.md b/README.md index 7693c5f..fd7c9ec 100644 --- a/README.md +++ b/README.md @@ -26,15 +26,15 @@ A terminal-based math tool that runs on linux. This program is free and open source. We allow everyone to use the source code for enrichment, compilation, etc. But we don't take any responsibility for any problems! -⚠worn: This program is in developing and cannot be used for scientific precision calculations! If anything goes wrong, do so at your own risk! +⚠ note: This program cannot be used for science! If anything goes wrong, do so at your own risk! ## ❔ How to use -Look in the GitAction and choose you need. +Look in the GitAction and choose waht you need. Or clone and compile by yourself. -📦 Compilation environment requirements: cmake, make, gcc +📦 Compilation environment requirements: cmake, ninja, gcc ## 🧑‍💻 Contribution and thanks From dc6b09153dc4289230407b0159a5a7ccbc3ba591 Mon Sep 17 00:00:00 2001 From: FTS427 Date: Sun, 14 Jan 2024 13:17:29 +0800 Subject: [PATCH 08/12] U | Pair the function --- src/main.cpp | 4 ++- src/module/calc.cpp | 59 +-------------------------------------------- 2 files changed, 4 insertions(+), 59 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 2ff2b98..4b2be99 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -26,7 +26,9 @@ int main(){ int a,b; char o; cin >>a>>o>>b; - cout << calc(a,b,o) <> num1 >> o >> num2; - if (o == '+') - printf("%f+%f=%f\n",num1,num2,num1+num2); - //减 - if (o == '-') - printf("%f-%f=%f\n",num1,num2,num1-num2); - //乘 - if (o == '*') - printf("%f*%f=%f\n",num1,num2,num1*num2); - //除 - if (o == '/'){ - if (num2 != 0) - printf("%f/%f=%f\n",num1,num2,num1/num2); - else - error(); - } - //乘方 - /* -if (o == '^') { -int n=num2; -if(num1 != 0 && num2 != 0){ -num3 = 1; -while(n > 0) { -int(num1)*int(num3)=num3; -n--; -} -} -else -error(); -printf("%f^%f=%f\n",num1,num2,num3); -} -*/ -/* - //退出 - if(o == 'c' && num1 == 0 && num2 ==0){ - clear(); - break; - } - //报错 - else - error(); - } -} -*/ int calc(int fn, int bn, char o){ if (o=='+') return fn+bn; @@ -82,4 +25,4 @@ int calc(int fn, int bn, char o){ error(); return 0; } -} \ No newline at end of file +} From 962b7e97a050a96b022a954b5f2af037861de052 Mon Sep 17 00:00:00 2001 From: FTS427 Date: Sun, 14 Jan 2024 20:10:40 +0800 Subject: [PATCH 09/12] U | Update v0.0.1.3-4 U | Use ninja build source --- README.md | 2 +- README_zh.md | 5 ++--- change_log.md | 4 ++++ make.sh | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index fd7c9ec..c98a8df 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ A terminal-based math tool that runs on linux. This program is free and open source. We allow everyone to use the source code for enrichment, compilation, etc. But we don't take any responsibility for any problems! -⚠ note: This program cannot be used for science! If anything goes wrong, do so at your own risk! +⚠ Note: This program cannot be used for science! If anything goes wrong, do so at your own risk! ## ❔ How to use diff --git a/README_zh.md b/README_zh.md index d43748a..1d19bfb 100644 --- a/README_zh.md +++ b/README_zh.md @@ -26,7 +26,7 @@ 本程序是免费开源的，此源代码可以随意使用。允许任何人使用源代码进行扩充，编译等操作。出现任何问题，本人不承担任何责任！ -⚠注意：本程序处于开发阶段，不可用于科学的精密计算！如果出现任何问题，后果自负！ +⚠ 注意：本程序处于开发阶段，不可用于科学的精密计算！如果出现任何问题，后果自负！ ## ❔如何使用 @@ -34,7 +34,7 @@ 或自行拉取编译 -📦编译环境需求：cmake, make，gcc +📦编译环境需求：cmake, ninja，gcc ## 🧑‍💻感谢 @@ -53,4 +53,3 @@ 本项目使用了头文件[ECPPH](https://github.com/QuantumLS-Studio/ECPPH) 先前的版本参见[MathCentralTools](https://github.com/FTS427/MathCentralTools)（已归档🗃️） - diff --git a/change_log.md b/change_log.md index b1571df..04afebc 100644 --- a/change_log.md +++ b/change_log.md @@ -75,3 +75,7 @@ - 功能：移除对Windows、Mac平台的支持 - UI：部分微调 - 整体：简化代码逻辑，便于维护 +- v0.0.1.3-4 + - 功能：无 + - UI：部分调整 + - 整体：代码部分重写，采用ninja&cmake编译 diff --git a/make.sh b/make.sh index 98594e4..9e423bd 100755 --- a/make.sh +++ b/make.sh @@ -1,5 +1,5 @@ cmake -S . -B ./build && cd ./build && -make && +ninja && echo "Done!" && echo "Exec -> build/MCT" From b4c5c30e5c8a6a2c946064709b755b59cac4e02d Mon Sep 17 00:00:00 2001 From: FTS427 Date: Sun, 14 Jan 2024 20:12:20 +0800 Subject: [PATCH 10/12] U | Update calc, error, etc. --- src/include/ecp.h | 21 ++++++++++++++------- src/main.cpp | 6 +++++- src/module/calc.cpp | 1 + 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/include/ecp.h b/src/include/ecp.h index e9b0c95..c25c2d5 100644 --- a/src/include/ecp.h +++ b/src/include/ecp.h @@ -9,10 +9,13 @@ using namespace std; int error(){ printf("\033[1,31mERROR!\033[0m\a\n"); - return 0; + return 1; } -void clear(){system("clear");} +int clear(){ + system("clear"); + return 0; +} void print(const char T[],string color,bool i){ if(i==true){ @@ -30,7 +33,8 @@ void print(const char T[],string color,bool i){ cout<<"\033[35m"< "< ","white",false); cin >>a>>o>>b; while (a!='0'&&b!='0'&&o!='c'){ cout << calc(a,b,o) < ","white",false); + cin >>a>>o>>b; } } if (q=='2') @@ -36,7 +41,6 @@ int main(){ C(); if (q=='4') D(); -//if (u=='5')E(); if (q=='E'||q=='e') break; if (q=='A'||q =='a'){ diff --git a/src/module/calc.cpp b/src/module/calc.cpp index e178dfc..b71dbca 100644 --- a/src/module/calc.cpp +++ b/src/module/calc.cpp @@ -1,3 +1,4 @@ +#include int calc(int fn, int bn, char o){ if (o=='+') return fn+bn; From 09f49939fab26d736f4399c781457ad6e500a410 Mon Sep 17 00:00:00 2001 From: FTS427 Date: Sun, 14 Jan 2024 20:24:15 +0800 Subject: [PATCH 11/12] U | Update ci --- .github/workflows/preview-build.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/preview-build.yml b/.github/workflows/preview-build.yml index 3daaee6..83322d3 100644 --- a/.github/workflows/preview-build.yml +++ b/.github/workflows/preview-build.yml @@ -11,6 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 + uses: threeal/cmake-action@v1.3.0 - name: CMake build run: | cd ${{ github.workspace }} @@ -21,14 +22,6 @@ jobs: cmake ../ echo "Done!" shell: sh - - name: Ninja build - run: | - cd ${{ github.workspace }} - ls - cd build - ninja - echo "Done!" - shell: sh - name: Upload exec file uses: actions/upload-artifact@v3.1.2 with: From 8657d99b102a0d2a9339538c89afcb14032c0fb7 Mon Sep 17 00:00:00 2001 From: FTS427 Date: Sun, 14 Jan 2024 20:34:59 +0800 Subject: [PATCH 12/12] U | Update ci --- .github/workflows/preview-build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/preview-build.yml b/.github/workflows/preview-build.yml index 83322d3..2deb37f 100644 --- a/.github/workflows/preview-build.yml +++ b/.github/workflows/preview-build.yml @@ -10,7 +10,9 @@ jobs: linux: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - name: Checkout + uses: actions/checkout@v3 + - name: Conifg cmake uses: threeal/cmake-action@v1.3.0 - name: CMake build run: |