some tweaks

This commit is contained in:
cathugger 2020-05-23 16:41:51 +00:00
parent a3e141e79b
commit d5b90d43a9
No known key found for this signature in database
GPG key ID: 9BADDA2DAF6F01A8
2 changed files with 12 additions and 5 deletions

View file

@ -82,12 +82,18 @@ TEST_EXE= $(patsubst %,%@EXEEXT@,$(TEST_TGT))
ALL_EXE= $(MAIN_EXE) $(UTIL_EXE) $(TEST_EXE) ALL_EXE= $(MAIN_EXE) $(UTIL_EXE) $(TEST_EXE)
.PHONY: default all clean distclean depend .PHONY: default all main util test clean distclean depend
default: $(MAIN_EXE) default: $(MAIN_EXE)
all: $(ALL_EXE) all: $(ALL_EXE)
main: $(MAIN_EXE)
util: $(UTIL_EXE)
test: $(TEST_EXE)
mkp224o@EXEEXT@: $(MAIN_OBJ) mkp224o@EXEEXT@: $(MAIN_OBJ)
$(CC) $(LDFLAGS) $(CFLAGS) -o $@.tmp $^ $(MAIN_LIB) && $(MV) $@.tmp $@ $(CC) $(LDFLAGS) $(CFLAGS) -o $@.tmp $^ $(MAIN_LIB) && $(MV) $@.tmp $@

View file

@ -1,4 +1,5 @@
#include <stdio.h> #include <stdio.h>
#include <stddef.h>
#include <math.h> #include <math.h>
/* /*
@ -19,20 +20,20 @@ const int charcounts[] = { 2, 3, 4, 5, 6, 7 };
int main(void) int main(void)
{ {
printf(" |"); printf(" |");
for (int i = 0; i < sizeof(probs)/sizeof(probs[0]); ++i) { for (size_t i = 0; i < sizeof(probs)/sizeof(probs[0]); ++i) {
printf(" %11d%% |",(int)((probs[i]*100)+0.5)); printf(" %11d%% |",(int)((probs[i]*100)+0.5));
} }
printf("\n"); printf("\n");
printf("---+"); printf("---+");
for (int i = 0; i < sizeof(probs)/sizeof(probs[0]); ++i) { for (size_t i = 0; i < sizeof(probs)/sizeof(probs[0]); ++i) {
printf("--------------+"); printf("--------------+");
} }
printf("\n"); printf("\n");
for (int i = 0; i < sizeof(charcounts)/sizeof(charcounts[0]); ++i) { for (size_t i = 0; i < sizeof(charcounts)/sizeof(charcounts[0]); ++i) {
printf("%2d |",charcounts[i]); printf("%2d |",charcounts[i]);
for (int j = 0; j < sizeof(probs)/sizeof(probs[0]); ++j) { for (size_t j = 0; j < sizeof(probs)/sizeof(probs[0]); ++j) {
double t = log2(1 - probs[j]) / log2(1 - (1 / pow(32,charcounts[i]))); double t = log2(1 - probs[j]) / log2(1 - (1 / pow(32,charcounts[i])));
printf(" %12.0f |",t); printf(" %12.0f |",t);
} }