Cleaned up and improved paper experiments

parent 9a52f44b
......@@ -13,10 +13,16 @@ mkdir -p ${outdir}
rm ${outdir}/*
mv *pbm latest/* ${outdir}
outdir="res/paper/conv-einstein-fwd"
outdir="res/paper/conv-einstein-fwd-mob"
./run bmf_learn_exp -i 6 -l 4 -k 16 -d 0 -I 1 $* data/einstein.pbm -v | tee ${outdir}.log
mkdir -p ${outdir}
rm ${outdir}/*
mv *pbm latest/* ${outdir}
outdir="res/paper/conv-einstein-fwd-kprox"
./run bmf_learn_exp -i 6 -l 4 -k 16 -d 1 -I 1 $* data/einstein.pbm -v | tee ${outdir}.log
mkdir -p ${outdir}
rm ${outdir}/*
mv *pbm latest/* ${outdir}
......@@ -12,10 +12,16 @@ rm ${outdir}/*
./run bmf_learn_exp -i 6 -l 0 -k 49 -d 1 -m 1 $* data/mnist_data.pbm -v -v | tee ${outdir}.log
mv *pbm latest/* ${outdir}
outdir="res/paper/conv-mnist-fwd"
outdir="res/paper/conv-mnist-fwd-mob"
mkdir -p ${outdir}
rm ${outdir}/*
./run bmf_learn_exp -i 6 -l 4 -k 10 -d 0 -m 1 $* data/mnist_data.pbm -v | tee ${outdir}.log
mv *pbm latest/* ${outdir}
outdir="res/paper/conv-mnist-fwd-kprox"
mkdir -p ${outdir}
rm ${outdir}/*
./run bmf_learn_exp -i 6 -l 4 -k 10 -d 1 -m 1 $* data/mnist_data.pbm -v | tee ${outdir}.log
mv *pbm latest/* ${outdir}
#!/bin/bash
make -C src -j 4
outdir="res/paper/conv/mnist"
./run bmf_learn_exp -i 1 -l 0 -k 100 -m 1 $* data/mnist_data.pbm -v -v | tee res/mnist/mnist.log
mkdir -p ${outdir}
rm ${outdir}/*
mv *pbm latest/* ${outdir}
outdir="res/paper/conv/usps"
./run bmf_learn_exp -i 1 -l 0 -k 100 -m 1 $* data/usps_data.pbm -v -v | tee res/usps/usps.log
mkdir -p ${outdir}
rm ${outdir}/*
mv *pbm latest/* ${outdir}
outdir="res/paper/conv/einstein"
./run bmf_learn_exp -i 1 -l 0 -k 100 -I 1 $* data/einstein.pbm -v -v
mkdir -p ${outdir}
rm ${outdir}/*
mv *pbm latest/* ${outdir}
#!/bin/bash
make -C src -j 4
outdir="res/paper/conv-kprox/mnist"
./run bmf_learn_exp -i 1 -l 0 -k 100 -d 1 -m 1 $* data/mnist_data.pbm -v -v | tee res/mnist/mnist.log
mkdir -p ${outdir}
rm ${outdir}/*
mv *pbm latest/* ${outdir}
outdir="res/paper/conv-kprox/usps"
./run bmf_learn_exp -i 1 -l 0 -k 100 -d 1 -m 1 $* data/usps_data.pbm -v -v | tee res/usps/usps.log
mkdir -p ${outdir}
rm ${outdir}/*
mv *pbm latest/* ${outdir}
outdir="res/paper/conv-kprox/einstein"
./run bmf_learn_exp -i 1 -l 0 -k 100 -d 1 -I 1 $* data/einstein.pbm -v -v
mkdir -p ${outdir}
rm ${outdir}/*
mv *pbm latest/* ${outdir}
# COMPARISON BETWEEN DIFFERENT MODEL SELECTION STRATEGIES
#!/bin/bash
echo COMPILE
make -C src -j 4
echo FWD
./run bmf_learn_exp -i 1 -l 4 -k 10 -m 1 -v $* data/mnist_data.pbm
OUTDIR="res/paper/modsel/fwd"
mkdir -p ${OUTDIR}
cp -r latest/* ${OUTDIR}
echo BACK
./run bmf_learn_exp -i 1 -l 5 -k 500 -m 1 -v $* data/mnist_data.pbm
OUTDIR="res/paper/modsel/back"
mkdir -p ${OUTDIR}
cp -r latest/* ${OUTDIR}
echo BACK
./run bmf_learn_exp -i 1 -l 6 -k 400 -m 1 -v $* data/mnist_data.pbm
OUTDIR="res/paper/modsel/full"
mkdir -p ${OUTDIR}
cp -r latest/* ${OUTDIR}
#mkdir -p res/paper/modsel/usps
#src/bmf_learn_exp -i 1 -l 4 -k 10 -m 1 $* data/usps_data.pbm | tee res/usps/usps.log
#mv *pbm res/usps/
#mkdir -p res/einstein
#src/bmf_learn_exp -i 1 -l 4 -k 20 -I 1 $* data/einstein.pbm | tee res/einstein/einstein.log
#mv *pbm res/einstein/
# COMPARISON BETWEEN DIFFERENT MODEL SELECTION STRATEGIES
#!/bin/bash
echo COMPILE
make -C src -j 4
echo FWD
./run bmf_learn_exp -c 2 -i 1 -l 4 -k 10 -m 1 -v $* data/usps_data.pbm
OUTDIR="res/paper/modsel/fwd"
mkdir -p ${OUTDIR}
cp -r latest/* ${OUTDIR}
echo BACK
./run bmf_learn_exp -c 2 -i 1 -l 5 -k 500 -m 1 -v $* data/usps_data.pbm
OUTDIR="res/paper/modsel/back"
mkdir -p ${OUTDIR}
cp -r latest/* ${OUTDIR}
echo BACK
./run bmf_learn_exp -c 2 -i 1 -l 6 -k 400 -m 1 -v $* data/usps_data.pbm
OUTDIR="res/paper/modsel/full"
mkdir -p ${OUTDIR}
cp -r latest/* ${OUTDIR}
#mkdir -p res/paper/modsel/usps
#src/bmf_learn_exp -i 1 -l 4 -k 10 -m 1 $* data/usps_data.pbm | tee res/usps/usps.log
#mv *pbm res/usps/
#mkdir -p res/einstein
#src/bmf_learn_exp -i 1 -l 4 -k 20 -I 1 $* data/einstein.pbm | tee res/einstein/einstein.log
#mv *pbm res/einstein/
#!/bin/bash
make -C src -j 4
mkdir -p res/mnist
src/bmf_learn_exp -i 1 -l 4 -k 10 -m 1 $* data/mnist_data.pbm | tee res/mnist/mnist.log
mv *pbm res/mnist
mkdir -p res/usps
src/bmf_learn_exp -i 1 -l 4 -k 10 -m 1 $* data/usps_data.pbm | tee res/usps/usps.log
mv *pbm res/usps/
mkdir -p res/einstein
src/bmf_learn_exp -i 1 -l 4 -k 20 -I 1 $* data/einstein.pbm | tee res/einstein/einstein.log
mv *pbm res/einstein/
......@@ -86,9 +86,9 @@ idx_t learn_model_traditional(binary_matrix& X,
A.copy_to(Aprev);
coefficients_update(E,H,D,A,ma,me);
update_dictionary(E,H,D,A);
dist(E,Eprev);
dist(D,Dprev);
dist(A,Aprev);
hdE = dist(E,Eprev);
hdD = dist(D,Dprev);
hdA = dist(A,Aprev);
} while (hdE > 0);
Eprev.destroy();
Aprev.destroy();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment