Smooth animation and add no-visual benchmark

This commit is contained in:
2026-08-09 18:21:04 +02:00
parent 1e98fa2297
commit a8ba3760f4
2 changed files with 20 additions and 15 deletions
+5 -1
View File
@@ -6,7 +6,11 @@ values and reports comparisons, moves, and elapsed time. **RUN ALL 8** ends
with a fair operation-count chart.
Controls: **Pause/Resume**, **Redo**, **Next**, **Run All 8**, and
**Algorithm Menu**. Build with `pio run`, upload with `pio run -t upload`.
**Algorithm Menu**. **No Visual** reruns the selected algorithm without any
animation, touch polling, or intentional delay during the timed section and
reports its duration with microsecond-derived precision. The bar animation is
rendered through a PSRAM-backed canvas for tear-free updates. Build with
`pio run`, upload with `pio run -t upload`.
The PlatformIO platform is pinned to the `54.03.21-2` maintenance release,
which includes esptool 5.0.2 and avoids the Click API error present with the
+15 -14
View File
@@ -2,7 +2,7 @@
#include <M5Unified.h>
namespace {
constexpr int N=48, CX=34, CY=142, CW=1212, CH=450;
constexpr int N=48, CX=34, CY=142, CW=1212, CH=410;
constexpr uint16_t BG=0x0841,PANEL=0x18E3,PANEL2=0x2125,MUTED=0xBDF7,CYAN=0x2E9F,YELLOW=0xFDC0,GREEN=0x4EE9;
struct Rect{int x,y,w,h;bool has(int px,int py)const{return px>=x&&px<x+w&&py>=y&&py<y+h;}};
struct Algo{const char* name;const char* lesson;const char* cost;};
@@ -15,19 +15,20 @@ const Algo alg[8]={
{"QUICKSORT","Partition in place around a median pivot","O(n log n)"},
{"HEAP SORT","Build a max-heap and drain its root","O(n log n)"},
{"RADIX SORT","Bucket by ones, tens, then hundreds","O(n)"}};
struct Result{uint32_t cmp=0,moves=0,ms=0;bool ready=false;} results[8];
struct Result{uint32_t cmp=0,moves=0,us=0;bool ready=false;} results[8];
int a[N],base[N],tmp[N],which=0,hotA=-1,hotB=-1;
uint32_t cmp=0,moves=0,startMs=0,pauseStart=0,pauseTotal=0,lastFrame=0;
bool paused=false,abortRun=false,redo=false,runAll=false;
const Rect pauseB{34,620,210,70},redoB{262,620,190,70},nextB{470,620,190,70},allB{678,620,250,70},menuB{946,620,300,70};
uint32_t cmp=0,moves=0,startMs=0,startUs=0,pauseStart=0,pauseTotal=0,lastFrame=0;
bool paused=false,abortRun=false,redo=false,runAll=false,benchmark=false;
M5Canvas barCanvas(&M5.Display);
const Rect pauseB{24,620,160,70},redoB{196,620,140,70},nextB{348,620,140,70},allB{500,620,180,70},benchB{692,620,250,70},menuB{954,620,302,70};
void label(const char*s,int x,int y,textdatum_t d,const lgfx::IFont*f,uint16_t c=TFT_WHITE,uint16_t bg=BG){M5.Display.setFont(f);M5.Display.setTextDatum(d);M5.Display.setTextColor(c,bg);M5.Display.drawString(s,x,y);}
void button(Rect r,const char*s,uint16_t c){M5.Display.fillRoundRect(r.x,r.y,r.w,r.h,14,c);M5.Display.drawRoundRect(r.x,r.y,r.w,r.h,14,TFT_WHITE);label(s,r.x+r.w/2,r.y+r.h/2,middle_center,&fonts::FreeSansBold12pt7b);}
void buttons(){button(pauseB,paused?"RESUME":"PAUSE",paused?GREEN:0x39A7);button(redoB,"REDO",0x620B);button(nextB,"NEXT",0x2B8E);button(allB,"RUN ALL 8",0x4A2E);button(menuB,"ALGORITHM MENU",0x31A6);}
void buttons(){button(pauseB,paused?"RESUME":"PAUSE",paused?GREEN:0x39A7);button(redoB,"REDO",0x620B);button(nextB,"NEXT",0x2B8E);button(allB,"RUN ALL",0x4A2E);button(benchB,"NO VISUAL",YELLOW);button(menuB,"ALGORITHM MENU",0x31A6);}
void header(){M5.Display.fillRect(0,0,1280,112,PANEL);M5.Display.fillRect(0,108,1280,4,CYAN);label(alg[which].name,32,40,middle_left,&fonts::FreeSansBold24pt7b);label(alg[which].cost,1246,36,middle_right,&fonts::FreeSansBold18pt7b,YELLOW,PANEL);label(alg[which].lesson,34,88,middle_left,&fonts::FreeSans12pt7b,MUTED,PANEL);}
void chart(bool force=false){uint32_t now=millis();if(!force&&now-lastFrame<16)return;lastFrame=now;M5.Display.startWrite();M5.Display.fillRect(CX,CY,CW,CH,BG);int gap=3,bw=(CW-(N-1)*gap)/N;for(int i=0;i<N;i++){int h=map(a[i],1,N,12,CH-26);uint16_t c=(i==hotA||i==hotB)?YELLOW:CYAN;M5.Display.fillRoundRect(CX+i*(bw+gap),CY+CH-h,bw,h,min(4,bw/2),c);}char s[100];snprintf(s,sizeof(s),"COMPARISONS %lu MOVES %lu %s",(unsigned long)cmp,(unsigned long)moves,paused?"PAUSED":"SORTING...");M5.Display.fillRect(34,580,1212,32,BG);label(s,34,594,middle_left,&fonts::FreeSans12pt7b,MUTED);M5.Display.endWrite();}
void touch(){M5.update();auto t=M5.Touch.getDetail();if(!t.wasReleased())return;if(pauseB.has(t.x,t.y)){paused=!paused;if(paused)pauseStart=millis();else pauseTotal+=millis()-pauseStart;buttons();}else if(redoB.has(t.x,t.y)){redo=true;abortRun=true;paused=false;}else if(nextB.has(t.x,t.y)){which=(which+1)%8;abortRun=true;paused=false;runAll=false;}else if(allB.has(t.x,t.y)){which=0;redo=true;abortRun=true;paused=false;runAll=true;for(auto&r:results)r=Result{};}else if(menuB.has(t.x,t.y)){abortRun=true;paused=false;runAll=false;}}
bool frame(int x=-1,int y=-1,int ms=7){hotA=x;hotB=y;chart();uint32_t end=millis()+ms;do{touch();while(paused&&!abortRun){touch();chart(true);delay(12);}if(abortRun)return false;delay(1);}while((int32_t)(end-millis())>0);return true;}
void chart(bool force=false){uint32_t now=millis();if(!force&&now-lastFrame<16)return;lastFrame=now;barCanvas.fillSprite(BG);int gap=3,bw=(CW-(N-1)*gap)/N;for(int i=0;i<N;i++){int h=map(a[i],1,N,12,CH-18);uint16_t c=(i==hotA||i==hotB)?YELLOW:CYAN;barCanvas.fillRoundRect(i*(bw+gap),CH-h,bw,h,min(4,bw/2),c);}barCanvas.pushSprite(CX,CY);char s[110];snprintf(s,sizeof(s),"COMPARISONS %lu MOVES %lu %s",(unsigned long)cmp,(unsigned long)moves,benchmark?"BENCHMARK: DISPLAY OFF":(paused?"PAUSED":"SORTING..."));M5.Display.fillRect(34,562,1212,46,BG);label(s,34,585,middle_left,&fonts::FreeSans12pt7b,MUTED);}
void touch(){M5.update();auto t=M5.Touch.getDetail();if(!t.wasReleased())return;if(pauseB.has(t.x,t.y)){paused=!paused;if(paused)pauseStart=millis();else pauseTotal+=millis()-pauseStart;buttons();}else if(redoB.has(t.x,t.y)){redo=true;abortRun=true;paused=false;}else if(nextB.has(t.x,t.y)){which=(which+1)%8;abortRun=true;paused=false;runAll=false;benchmark=false;}else if(allB.has(t.x,t.y)){which=0;redo=true;abortRun=true;paused=false;runAll=true;benchmark=false;for(auto&r:results)r=Result{};}else if(benchB.has(t.x,t.y)){benchmark=true;redo=true;abortRun=true;paused=false;runAll=false;}else if(menuB.has(t.x,t.y)){abortRun=true;paused=false;runAll=false;benchmark=false;}}
bool frame(int x=-1,int y=-1,int ms=7){if(benchmark)return true;hotA=x;hotB=y;chart();uint32_t end=millis()+ms;do{touch();while(paused&&!abortRun){touch();chart(true);delay(12);}if(abortRun)return false;delay(1);}while((int32_t)(end-millis())>0);return true;}
void swapv(int x,int y){if(x==y)return;int v=a[x];a[x]=a[y];a[y]=v;moves+=3;}void writev(int i,int v){a[i]=v;moves++;}
bool bubble(){for(int end=N-1;end>0;end--){bool changed=false;for(int i=0;i<end;i++){cmp++;if(a[i]>a[i+1]){swapv(i,i+1);changed=true;}if(!frame(i,i+1))return false;}if(!changed)break;}return true;}
@@ -44,10 +45,10 @@ bool sortNow(){switch(which){case 0:return bubble();case 1:return insertion();ca
void reset(){for(int i=0;i<N;i++)a[i]=base[i];cmp=moves=pauseTotal=0;paused=abortRun=redo=false;}
void runScreen(){M5.Display.fillScreen(BG);header();buttons();chart(true);}
bool waitFor(uint32_t ms){uint32_t s=millis();while(millis()-s<ms){touch();if(abortRun)return false;delay(10);}return true;}
void result(){hotA=hotB=-1;chart(true);delay(150);Rect c{246,205,788,300};M5.Display.fillRoundRect(c.x,c.y,c.w,c.h,24,PANEL);M5.Display.drawRoundRect(c.x,c.y,c.w,c.h,24,CYAN);label("SORTED!",640,250,middle_center,&fonts::FreeSansBold24pt7b,GREEN,PANEL);const char* n[]={"COMPARISONS","MOVES","SECONDS"};for(int i=0;i<3;i++){label(n[i],430,330+i*58,middle_left,&fonts::FreeSansBold12pt7b,MUTED,PANEL);label("...",850,330+i*58,middle_right,&fonts::FreeSansBold18pt7b,YELLOW,PANEL);delay(160);}char v[24];snprintf(v,sizeof(v),"%lu",(unsigned long)cmp);M5.Display.fillRect(700,305,190,42,PANEL);label(v,850,330,middle_right,&fonts::FreeSansBold18pt7b,YELLOW,PANEL);delay(200);snprintf(v,sizeof(v),"%lu",(unsigned long)moves);M5.Display.fillRect(700,363,190,42,PANEL);label(v,850,388,middle_right,&fonts::FreeSansBold18pt7b,YELLOW,PANEL);delay(200);snprintf(v,sizeof(v),"%.2f",results[which].ms/1000.0f);M5.Display.fillRect(700,421,190,42,PANEL);label(v,850,446,middle_right,&fonts::FreeSansBold18pt7b,YELLOW,PANEL);}
void summary(){M5.Display.fillScreen(BG);M5.Display.fillRect(0,0,1280,96,PANEL);label("SAME DATA: ALL 8 ALGORITHMS",32,40,middle_left,&fonts::FreeSansBold24pt7b,TFT_WHITE,PANEL);label("OPERATIONS",1246,40,middle_right,&fonts::FreeSansBold12pt7b,YELLOW,PANEL);uint32_t top=1;for(auto&r:results)top=max(top,r.cmp+r.moves);for(int i=0;i<8;i++){int y=125+i*62;uint32_t ops=results[i].cmp+results[i].moves;int w=(uint64_t)ops*700/top;label(alg[i].name,38,y+20,middle_left,&fonts::FreeSans12pt7b);M5.Display.fillRoundRect(330,y,700,38,8,PANEL2);M5.Display.fillRoundRect(330,y,max(3,w),38,8,i==7?GREEN:CYAN);char s[48];snprintf(s,sizeof(s),"%lu %.2fs",(unsigned long)ops,results[i].ms/1000.0f);label(s,1238,y+20,middle_right,&fonts::FreeSans12pt7b,MUTED);}label("Operations = comparisons + moves. Tap anywhere for the menu.",640,682,middle_center,&fonts::FreeSans12pt7b,MUTED);while(true){M5.update();if(M5.Touch.getDetail().wasReleased())break;delay(12);}}
void result(){hotA=hotB=-1;chart(true);delay(150);Rect c{246,205,788,300};M5.Display.fillRoundRect(c.x,c.y,c.w,c.h,24,PANEL);M5.Display.drawRoundRect(c.x,c.y,c.w,c.h,24,CYAN);label(benchmark?"BENCHMARK DONE!":"SORTED!",640,250,middle_center,&fonts::FreeSansBold24pt7b,GREEN,PANEL);const char* n[]={"COMPARISONS","MOVES","TIME"};for(int i=0;i<3;i++){label(n[i],430,330+i*58,middle_left,&fonts::FreeSansBold12pt7b,MUTED,PANEL);label("...",850,330+i*58,middle_right,&fonts::FreeSansBold18pt7b,YELLOW,PANEL);delay(benchmark?0:160);}char v[32];snprintf(v,sizeof(v),"%lu",(unsigned long)cmp);M5.Display.fillRect(650,305,240,42,PANEL);label(v,850,330,middle_right,&fonts::FreeSansBold18pt7b,YELLOW,PANEL);if(!benchmark)delay(200);snprintf(v,sizeof(v),"%lu",(unsigned long)moves);M5.Display.fillRect(650,363,240,42,PANEL);label(v,850,388,middle_right,&fonts::FreeSansBold18pt7b,YELLOW,PANEL);if(!benchmark)delay(200);snprintf(v,sizeof(v),"%.3f ms",results[which].us/1000.0f);M5.Display.fillRect(650,421,240,42,PANEL);label(v,850,446,middle_right,&fonts::FreeSansBold18pt7b,YELLOW,PANEL);}
void summary(){M5.Display.fillScreen(BG);M5.Display.fillRect(0,0,1280,96,PANEL);label("SAME DATA: ALL 8 ALGORITHMS",32,40,middle_left,&fonts::FreeSansBold24pt7b,TFT_WHITE,PANEL);label("OPERATIONS",1246,40,middle_right,&fonts::FreeSansBold12pt7b,YELLOW,PANEL);uint32_t top=1;for(auto&r:results)top=max(top,r.cmp+r.moves);for(int i=0;i<8;i++){int y=125+i*62;uint32_t ops=results[i].cmp+results[i].moves;int w=(uint64_t)ops*700/top;label(alg[i].name,38,y+20,middle_left,&fonts::FreeSans12pt7b);M5.Display.fillRoundRect(330,y,700,38,8,PANEL2);M5.Display.fillRoundRect(330,y,max(3,w),38,8,i==7?GREEN:CYAN);char s[48];snprintf(s,sizeof(s),"%lu %.1fms",(unsigned long)ops,results[i].us/1000.0f);label(s,1238,y+20,middle_right,&fonts::FreeSans12pt7b,MUTED);}label("Operations = comparisons + moves. Tap anywhere for the menu.",640,682,middle_center,&fonts::FreeSans12pt7b,MUTED);while(true){M5.update();if(M5.Touch.getDetail().wasReleased())break;delay(12);}}
void shuffle(){for(int i=0;i<N;i++)base[i]=i+1;for(int i=N-1;i>0;i--){int j=random(i+1);int v=base[i];base[i]=base[j];base[j]=v;}}
void menu(){M5.Display.fillScreen(BG);M5.Display.fillRect(0,0,1280,102,PANEL);label("SORTING LAB",34,42,middle_left,&fonts::FreeSansBold24pt7b,TFT_WHITE,PANEL);label("Choose one, or run all on the same shuffled data",1244,42,middle_right,&fonts::FreeSans12pt7b,MUTED,PANEL);for(int i=0;i<8;i++){int col=i%2,row=i/2;Rect r{34+col*614,126+row*112,596,94};M5.Display.fillRoundRect(r.x,r.y,r.w,r.h,16,PANEL2);M5.Display.drawRoundRect(r.x,r.y,r.w,r.h,16,0x31A6);label(alg[i].name,r.x+24,r.y+31,middle_left,&fonts::FreeSansBold12pt7b,TFT_WHITE,PANEL2);label(alg[i].lesson,r.x+24,r.y+67,middle_left,&fonts::FreeSans9pt7b,MUTED,PANEL2);label(alg[i].cost,r.x+r.w-18,r.y+31,middle_right,&fonts::FreeSansBold12pt7b,YELLOW,PANEL2);}Rect sh{34,598,300,78},all{352,598,894,78};button(sh,"NEW SHUFFLE",0x620B);button(all,"RUN ALL 8",0x4A2E);while(true){M5.update();auto t=M5.Touch.getDetail();if(t.wasReleased()){if(sh.has(t.x,t.y)){shuffle();menu();return;}if(all.has(t.x,t.y)){which=0;runAll=true;for(auto&r:results)r=Result{};return;}for(int i=0;i<8;i++){Rect r{34+(i%2)*614,126+(i/2)*112,596,94};if(r.has(t.x,t.y)){which=i;runAll=false;return;}}}delay(12);}}
void menu(){M5.Display.fillScreen(BG);M5.Display.fillRect(0,0,1280,102,PANEL);label("SORTING LAB",34,42,middle_left,&fonts::FreeSansBold24pt7b,TFT_WHITE,PANEL);label("Choose one, or run all on the same shuffled data",1244,42,middle_right,&fonts::FreeSans12pt7b,MUTED,PANEL);for(int i=0;i<8;i++){int col=i%2,row=i/2;Rect r{34+col*614,126+row*112,596,94};uint16_t fill=i==which?0x2B8E:PANEL2;M5.Display.fillRoundRect(r.x,r.y,r.w,r.h,16,fill);M5.Display.drawRoundRect(r.x,r.y,r.w,r.h,16,0x31A6);label(alg[i].name,r.x+24,r.y+31,middle_left,&fonts::FreeSansBold12pt7b,TFT_WHITE,fill);label(alg[i].lesson,r.x+24,r.y+67,middle_left,&fonts::FreeSans9pt7b,MUTED,fill);label(alg[i].cost,r.x+r.w-18,r.y+31,middle_right,&fonts::FreeSansBold12pt7b,YELLOW,fill);}Rect sh{34,598,250,78},fast{302,598,370,78},all{690,598,556,78};button(sh,"NEW SHUFFLE",0x620B);button(fast,"NO-VISUAL BENCHMARK",YELLOW);button(all,"RUN ALL 8",0x4A2E);while(true){M5.update();auto t=M5.Touch.getDetail();if(t.wasReleased()){if(sh.has(t.x,t.y)){shuffle();menu();return;}if(fast.has(t.x,t.y)){benchmark=true;runAll=false;return;}if(all.has(t.x,t.y)){which=0;runAll=true;benchmark=false;for(auto&r:results)r=Result{};return;}for(int i=0;i<8;i++){Rect r{34+(i%2)*614,126+(i/2)*112,596,94};if(r.has(t.x,t.y)){which=i;runAll=false;benchmark=false;return;}}}delay(12);}}
}
void setup(){Serial.begin(115200);auto cfg=M5.config();M5.begin(cfg);M5.Display.setRotation(1);M5.Display.setColorDepth(16);M5.Display.setBrightness(180);randomSeed(esp_random());shuffle();Serial.println("Tab5 Sorting Lab ready");}
void loop(){menu();do{reset();runScreen();startMs=millis();bool done=sortNow();if(done){uint32_t elapsed=millis()-startMs-pauseTotal;results[which]={cmp,moves,elapsed,true};result();Serial.printf("%s: %lu comparisons, %lu moves, %lu ms\n",alg[which].name,(unsigned long)cmp,(unsigned long)moves,(unsigned long)elapsed);if(runAll){if(waitFor(1700)&&which<7){which++;continue;}if(which==7){summary();runAll=false;}break;}waitFor(10000);break;}bool again=redo;abortRun=false;if(again)continue;break;}while(true);}
void setup(){Serial.begin(115200);auto cfg=M5.config();M5.begin(cfg);M5.Display.setRotation(1);M5.Display.setColorDepth(16);M5.Display.setBrightness(180);barCanvas.setColorDepth(16);barCanvas.setPsram(true);barCanvas.createSprite(CW,CH);randomSeed(esp_random());shuffle();Serial.println("Tab5 Sorting Lab ready");}
void loop(){menu();do{reset();runScreen();startMs=millis();startUs=micros();bool done=sortNow();if(done){uint32_t elapsedUs=benchmark?(micros()-startUs):(millis()-startMs-pauseTotal)*1000UL;results[which]={cmp,moves,elapsedUs,true};result();Serial.printf("%s: %lu comparisons, %lu moves, %.3f ms%s\n",alg[which].name,(unsigned long)cmp,(unsigned long)moves,elapsedUs/1000.0f,benchmark?" (no visual)":"");if(runAll){if(waitFor(1700)&&which<7){which++;continue;}if(which==7){summary();runAll=false;}break;}waitFor(10000);break;}bool again=redo;abortRun=false;if(again)continue;break;}while(true);}