difu

parent ca8c47bd
......@@ -30,3 +30,14 @@
*.exe
*.out
*.app
*tool
*exp
*test
# data
contrib/*
results/*
*.zip
*.7z
*.p?m
*.png
*.ascii
#!/bin/bash
mkdir -p res/denoise
src/add_noise_tool data/einstein.pbm res/denoise/einstein_p0.02.pbm 0.02
src/extract_patches_tool res/denoise/einstein_p0.02.pbm 8 1 res/denoise/einstein_p0.02_patches.pbm
src/bmf_denoising_exp -l 4 -c 2 -i 1 -p 0.02 -k 100 ${*} -o res/denoise/einstein_p0.02_patches_den.pbm res/denoise/einstein_p0.02_patches.pbm
src/stitch_patches_tool res/denoise/einstein_p0.02_patches_den.pbm 896 1160 1 res/denoise/einstein_p0.02_den.pbm
#mv *.pbm res/denoise
mkdir -p results/denoise
src/add_noise_tool data/einstein.pbm results/denoise/einstein_p0.02.pbm 0.02
src/extract_patches_tool results/denoise/einstein_p0.02.pbm 8 1 res/denoise/einstein_p0.02_patches.pbm
src/bmf_denoising_exp -l 4 -c 2 -i 1 -p 0.02 -k 100 ${*} -o results/denoise/einstein_p0.02_patches_den.pbm res/denoise/einstein_p0.02_patches.pbm
src/stitch_patches_tool results/denoise/einstein_p0.02_patches_den.pbm 896 1160 1 res/denoise/einstein_p0.02_den.pbm
#mv *.pbm results/denoise
#!/bin/bash
mkdir -p res/denoise2
src/add_noise_tool data/einstein.pbm res/denoise2/einstein_p0.02.pbm 0.02
src/extract_patches_tool res/denoise2/einstein_p0.02.pbm 16 res/denoise2/einstein_p0.02_patches.pbm
src/bmf_denoising_exp -i 5 -p 0.02 -k 512 ${*} -o res/denoise2/einstein_p0.02_patches_den.pbm res/denoise2/einstein_p0.02_patches.pbm
src/stitch_patches_tool res/denoise2/einstein_p0.02_patches_den.pbm 896 1160 res/denoise2/einstein_p0.02_den.pbm
mv *.pbm res/denoise2
mkdir -p results/denoise2
src/add_noise_tool data/einstein.pbm results/denoise2/einstein_p0.02.pbm 0.02
src/extract_patches_tool results/denoise2/einstein_p0.02.pbm 16 res/denoise2/einstein_p0.02_patches.pbm
src/bmf_denoising_exp -i 5 -p 0.02 -k 512 ${*} -o results/denoise2/einstein_p0.02_patches_den.pbm res/denoise2/einstein_p0.02_patches.pbm
src/stitch_patches_tool results/denoise2/einstein_p0.02_patches_den.pbm 896 1160 res/denoise2/einstein_p0.02_den.pbm
mv *.pbm results/denoise2
#!/bin/bash
make -C src -j 4
mkdir -p res/mnist
time 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 results/mnist
time src/bmf_learn_exp -i 1 -l 4 -k 10 -m 1 $* data/mnist_data.pbm | tee results/mnist/mnist.log
mv *pbm results/mnist
mkdir -p res/usps
time 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 results/usps
time src/bmf_learn_exp -i 1 -l 4 -k 10 -m 1 $* data/usps_data.pbm | tee results/usps/usps.log
mv *pbm results/usps/
mkdir -p res/einstein
time src/bmf_learn_exp -i 1 -l 4 -k 20 -I 1 $* data/einstein.pbm | tee res/einstein/einstein.log
mv *pbm res/einstein/
mkdir -p results/einstein
time src/bmf_learn_exp -i 1 -l 4 -k 20 -I 1 $* data/einstein.pbm | tee results/einstein/einstein.log
mv *pbm results/einstein/
#!/bin/bash
make -C src -j 4
mkdir -p res/mnist/kprox
time src/bmf_learn_exp -i 1 -l 4 -k 10 -m 1 -d 1 $* data/mnist_data.pbm | tee res/mnist/kprox/mnist.log
mv *pbm res/mnist/kprox
mkdir -p results/mnist/kprox
time src/bmf_learn_exp -i 1 -l 4 -k 10 -m 1 -d 1 $* data/mnist_data.pbm | tee results/mnist/kprox/mnist.log
mv *pbm results/mnist/kprox
mkdir -p res/usps/kprox
time src/bmf_learn_exp -i 1 -l 4 -k 10 -m 1 -d 1 $* data/usps_data.pbm | tee res/usps/kprox/usps.log
mv *pbm res/usps/kprox
mkdir -p results/usps/kprox
time src/bmf_learn_exp -i 1 -l 4 -k 10 -m 1 -d 1 $* data/usps_data.pbm | tee results/usps/kprox/usps.log
mv *pbm results/usps/kprox
mkdir -p res/einstein/kprox
time src/bmf_learn_exp -i 1 -l 4 -k 20 -I 1 -d 1 $* data/einstein.pbm | tee res/einstein/kprox/einstein.log
mv *pbm res/einstein/kprox
mkdir -p results/einstein/kprox
time src/bmf_learn_exp -i 1 -l 4 -k 20 -I 1 -d 1 $* data/einstein.pbm | tee results/einstein/kprox/einstein.log
mv *pbm results/einstein/kprox
#!/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 results/mnist
src/bmf_learn_exp -i 1 -l 4 -k 10 -m 1 $* data/mnist_data.pbm | tee results/mnist/mnist.log
mv *pbm results/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 results/usps
src/bmf_learn_exp -i 1 -l 4 -k 10 -m 1 $* data/usps_data.pbm | tee results/usps/usps.log
mv *pbm results/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/
mkdir -p results/einstein
src/bmf_learn_exp -i 1 -l 4 -k 20 -I 1 $* data/einstein.pbm | tee results/einstein/einstein.log
mv *pbm results/einstein/
#!/bin/bash
make -C src -j 4
outdir="res/paper/conv-einstein-mob"
./run bmf_learn_exp -i 6 -l 0 -k 100 -d 0 -I 1 $* data/einstein.pbm -v -v | tee ${outdir}.log
outdir="results/paper/conv-einstein-mob"
mkdir -p ${outdir}
rm ${outdir}/*
./run bmf_learn_exp -i 6 -l 0 -k 36 -d 0 -I 1 $* data/einstein.pbm -v -v | tee ${outdir}.log
mv *pbm latest/* ${outdir}
outdir="res/paper/conv-einstein-kprox"
./run bmf_learn_exp -i 6 -l 0 -k 100 -d 1 -I 1 $* data/einstein.pbm -v -v | tee ${outdir}.log
outdir="results/paper/conv-einstein-kprox"
mkdir -p ${outdir}
rm ${outdir}/*
./run bmf_learn_exp -i 6 -l 0 -k 36 -d 1 -I 1 $* data/einstein.pbm -v -v | tee ${outdir}.log
mv *pbm latest/* ${outdir}
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
outdir="results/paper/conv-einstein-fwd-mob"
mkdir -p ${outdir}
rm ${outdir}/*
./run bmf_learn_exp -i 6 -l 4 -k 16 -d 0 -I 1 $* data/einstein.pbm -v | tee ${outdir}.log
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
outdir="results/paper/conv-einstein-fwd-kprox"
mkdir -p ${outdir}
rm ${outdir}/*
./run bmf_learn_exp -i 6 -l 4 -k 16 -d 1 -I 1 $* data/einstein.pbm -v | tee ${outdir}.log
mv *pbm latest/* ${outdir}
#!/bin/bash
make -C src -j 4
outdir="res/paper/conv-mnist-mob"
outdir="results/paper/conv-mnist-mob"
mkdir -p ${outdir}
rm ${outdir}/*
./run bmf_learn_exp -i 6 -l 0 -k 49 -d 0 -m 1 $* data/mnist_data.pbm -v -v | tee ${outdir}.log
./run bmf_learn_exp -i 6 -l 0 -k 36 -d 0 -m 1 $* data/mnist_data.pbm -v -v | tee ${outdir}.log
mv *pbm latest/* ${outdir}
outdir="res/paper/conv-mnist-kprox"
outdir="results/paper/conv-mnist-kprox"
mkdir -p ${outdir}
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
./run bmf_learn_exp -i 6 -l 0 -k 36 -d 1 -m 1 $* data/mnist_data.pbm -v -v | tee ${outdir}.log
mv *pbm latest/* ${outdir}
outdir="res/paper/conv-mnist-fwd-mob"
outdir="results/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
./run bmf_learn_exp -i 6 -l 4 -k 16 -d 0 -m 1 $* data/mnist_data.pbm -v | tee ${outdir}.log
mv *pbm latest/* ${outdir}
outdir="res/paper/conv-mnist-fwd-kprox"
outdir="results/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
./run bmf_learn_exp -i 6 -l 4 -k 16 -d 1 -m 1 $* data/mnist_data.pbm -v | tee ${outdir}.log
mv *pbm latest/* ${outdir}
#!/bin/bash
make -C src -j 4
outdir=mkdir -p res/einstein
outdir="res/paper/init-mob-samp-einstein"
outdir=mkdir -p results/einstein
outdir="results/paper/init-mob-samp-einstein"
mkdir -p ${outdir}
rm ${outdir}/*
./run bmf_learn_exp -l 0 -k 36 -m 1 -d 0 -i 6 -I 1 data/einstein.pbm -v
mv *pbm latest/* ${outdir}
outdir="res/paper/init-mob-rand-einstein"
outdir="results/paper/init-mob-rand-einstein"
mkdir -p ${outdir}
rm ${outdir}/*
./run bmf_learn_exp -l 0 -k 36 -m 1 -d 0 -i 5 -I 1 data/einstein.pbm -v
mv *pbm latest/* ${outdir}
outdir=mkdir -p res/einstein
outdir="res/paper/init-kprox-samp-einstein"
outdir=mkdir -p results/einstein
outdir="results/paper/init-kprox-samp-einstein"
mkdir -p ${outdir}
rm ${outdir}/*
./run bmf_learn_exp -l 0 -k 36 -m 1 -d 1 -i 6 -I 1 data/einstein.pbm -v
mv *pbm latest/* ${outdir}
outdir="res/paper/init-kprox-rand-einstein"
outdir="results/paper/init-kprox-rand-einstein"
mkdir -p ${outdir}
rm ${outdir}/*
./run bmf_learn_exp -l 0 -k 36 -m 1 -d 1 -i 5 -I 1 data/einstein.pbm -v
......
#!/bin/bash
make -C src -j 4
outdir=mkdir -p res/mnist
outdir="res/paper/init-mob-samp-mnist"
outdir=mkdir -p results/mnist
outdir="results/paper/init-mob-samp-mnist"
mkdir -p ${outdir}
rm ${outdir}/*
./run bmf_learn_exp -l 0 -k 36 -m 1 -d 0 -i 6 data/mnist_data.pbm -v
mv *pbm latest/* ${outdir}
outdir="res/paper/init-mob-rand-mnist"
outdir="results/paper/init-mob-rand-mnist"
mkdir -p ${outdir}
rm ${outdir}/*
./run bmf_learn_exp -l 0 -k 36 -m 1 -d 0 -i 5 data/mnist_data.pbm -v
mv *pbm latest/* ${outdir}
outdir="res/paper/init-kprox-samp-mnist"
outdir="results/paper/init-kprox-samp-mnist"
mkdir -p ${outdir}
rm ${outdir}/*
./run bmf_learn_exp -l 0 -k 36 -m 1 -d 1 -i 6 data/mnist_data.pbm -v
mv *pbm latest/* ${outdir}
outdir="res/paper/init-kprox-rand-mnist"
outdir="results/paper/init-kprox-rand-mnist"
mkdir -p ${outdir}
rm ${outdir}/*
./run bmf_learn_exp -l 0 -k 36 -m 1 -d 1 -i 5 data/mnist_data.pbm -v
......
#!/bin/bash
make -C src -j 4
outdir=mkdir -p res/usps
outdir="res/paper/init-mob-samp-usps"
outdir=mkdir -p results/usps
outdir="results/paper/init-mob-samp-usps"
mkdir -p ${outdir}
rm ${outdir}/*
./run bmf_learn_exp -l 0 -k 36 -m 1 -d 0 -i 6 data/usps_data.pbm -v
mv *pbm latest/* ${outdir}
outdir="res/paper/init-mob-rand-usps"
outdir="results/paper/init-mob-rand-usps"
mkdir -p ${outdir}
rm ${outdir}/*
./run bmf_learn_exp -l 0 -k 36 -m 1 -d 0 -i 5 data/usps_data.pbm -v
mv *pbm latest/* ${outdir}
outdir="res/paper/init-kprox-samp-usps"
outdir="results/paper/init-kprox-samp-usps"
mkdir -p ${outdir}
rm ${outdir}/*
./run bmf_learn_exp -l 0 -k 36 -m 1 -d 1 -i 6 data/usps_data.pbm -v
mv *pbm latest/* ${outdir}
outdir="res/paper/init-kprox-rand-usps"
outdir="results/paper/init-kprox-rand-usps"
mkdir -p ${outdir}
rm ${outdir}/*
./run bmf_learn_exp -l 0 -k 36 -m 1 -d 1 -i 5 data/usps_data.pbm -v
......
#!/bin/bash
git pull
make -C src -j 4
outdir="res/einstein-learn-kprox"
outdir="results/einstein-learn-kprox"
mkdir -p ${outdir}
time src/bmf_learn_exp -i 1 -l 4 -k 20 -I 1 -d 1 $* data/einstein.pbm | tee ${outdir}.log
mv *pbm ${outdir}
#!/bin/bash
git pull
make -C src -j 4
outdir="res/einstein-learn-mob"
outdir="results/einstein-learn-mob"
mkdir -p ${outdir}
time src/bmf_learn_exp -i 1 -l 4 -k 20 -I 1 $* data/einstein.pbm | tee ${outdir}.log
mv *pbm ${outdir}
#!/bin/bash
git pull
make -C src -j 4
mkdir -p res/hgdp/kprox
#time src/bmf_learn_exp -i 1 -l 4 -k 3 -m 1 -d 1 $* data/dist.pbm data/mask.pbm | tee res/hgdp/kprox/hgdp.log
time src/bmf_learn_exp -i 1 -l 4 -k 3 -m 1 -d 1 $* data/dist.pbm | tee res/hgdp/kprox/hgdp.log
mv *pbm res/hgdp/kprox
mkdir -p results/hgdp/kprox
#time src/bmf_learn_exp -i 1 -l 4 -k 3 -m 1 -d 1 $* data/dist.pbm data/mask.pbm | tee results/hgdp/kprox/hgdp.log
time src/bmf_learn_exp -i 1 -l 4 -k 3 -m 1 -d 1 $* data/dist.pbm | tee results/hgdp/kprox/hgdp.log
mv *pbm results/hgdp/kprox
#!/bin/bash
git pull
make -C src -j 4
mkdir -p res/hgdp/mob
#time src/bmf_learn_exp -i 1 -l 4 -k 3 -m 1 -d 1 $* data/dist.pbm data/mask.pbm | tee res/hgdp/mob/hgdp.log
time src/bmf_learn_exp -i 2 -l 4 -k 64 -m 0 -d 0 $* -v data/dist.pbm | tee res/hgdp/mob/hgdp.log
mv *pbm res/hgdp/mob
mkdir -p results/hgdp/mob
#time src/bmf_learn_exp -i 1 -l 4 -k 3 -m 1 -d 1 $* data/dist.pbm data/mask.pbm | tee results/hgdp/mob/hgdp.log
time src/bmf_learn_exp -i 2 -l 4 -k 64 -m 0 -d 0 $* -v data/dist.pbm | tee results/hgdp/mob/hgdp.log
mv *pbm results/hgdp/mob
#!/bin/bash
make -C src -j 4
outdir="res/mnist-learn-kprox"
outdir="results/mnist-learn-kprox"
mkdir -p ${outdir}
time src/bmf_learn_exp -i 1 -l 4 -k 10 -m 1 -d 1 $* data/mnist_data.pbm | tee ${outdir}.log
mv *pbm ${outdir}
#!/bin/bash
make -C src -j 4
outdir="res/mnist-learn-mob"
outdir="results/mnist-learn-mob"
mkdir -p ${outdir}
time src/bmf_learn_exp -i 1 -l 4 -k 10 -m 1 $* data/mnist_data.pbm | tee ${ouitdir}.log
mv *pbm ${outdir}
#!/bin/bash
git pull
make -j 4 -C src
mkdir -p res/usps/kprox
time src/bmf_learn_exp -i 1 -l 4 -k 10 -m 1 -d 1 $* data/usps_data.pbm | tee res/usps/kprox/usps.log
mv *pbm res/usps/kprox
mkdir -p results/usps/kprox
time src/bmf_learn_exp -i 1 -l 4 -k 10 -m 1 -d 1 $* data/usps_data.pbm | tee results/usps/kprox/usps.log
mv *pbm results/usps/kprox
#!/bin/bash
git pull
make -C src -j 4
mkdir -p res/usps
time 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 results/usps
time src/bmf_learn_exp -i 1 -l 4 -k 10 -m 1 $* data/usps_data.pbm | tee results/usps/usps.log
mv *pbm results/usps/
#!/bin/bash
make -C src -j 4
outdir="res/paper/models/mnist"
outdir="results/paper/models/mnist"
./run bmf_learn_exp -i 1 -l 4 -k 100 -m 1 $* data/mnist_data.pbm -v
mkdir -p ${outdir}
rm ${outdir}/*
mv *pbm latest/* ${outdir}
outdir="res/paper/models/usps"
outdir="results/paper/models/usps"
./run bmf_learn_exp -i 1 -l 4 -k 100 -m 1 $* data/usps_data.pbm -v
mkdir -p ${outdir}
rm ${outdir}/*
mv *pbm latest/* ${outdir}
outdir="res/paper/models/einstein"
outdir="results/paper/models/einstein"
./run bmf_learn_exp -i 1 -l 4 -k 20 -I 1 $* data/einstein.pbm -v
mkdir -p ${outdir}
rm ${outdir}/*
......
#!/bin/bash
make -C src -j 4
outdir="res/paper/models-kprox/mnist"
outdir="results/paper/models-kprox/mnist"
./run bmf_learn_exp -i 1 -l 4 -k 10 -m 1 -d 1 $* data/mnist_data.pbm -v
mkdir -p ${outdir}
rm ${outdir}/*
mv *pbm latest/* ${outdir}
outdir="res/paper/models-kprox/usps"
outdir="results/paper/models-kprox/usps"
./run bmf_learn_exp -i 1 -l 4 -k 10 -m 1 -d 1 $* data/usps_data.pbm -v
mkdir -p ${outdir}
rm ${outdir}/*
mv *pbm latest/* ${outdir}
outdir="res/paper/models-kprox/einstein"
outdir="results/paper/models-kprox/einstein"
./run bmf_learn_exp -i 1 -l 4 -k 20 -I 1 -d 1 $* data/einstein.pbm -v
mkdir -p ${outdir}
rm ${outdir}/*
......
......@@ -72,9 +72,9 @@ idx_t learn_model_traditional(binary_matrix& X,
<< "| " << std::setw(FW-2) << ((double)L.D)/((double)X.get_len())
<< "| " << std::setw(FW-2) << ((double)L.A)/((double)X.get_len())
<< "| " << std::setw(FW-2) << ((double)L.X)/((double)X.get_len())
<< "| " << std::setw(FW-2) << hdE
<< "| " << std::setw(FW-2) << hdD
<< "| " << std::setw(FW-2) << hdA
<< "| " << std::setw(FW-2) << hdE/(double)E.get_len()
<< "| " << std::setw(FW-2) << hdD/(double)D.get_len()
<< "| " << std::setw(FW-2) << hdA/(double)A.get_len()
<< "| " << std::setw(FW-2) << ((double)(clock()-tic))/CLOCKS_PER_SEC
<< "| " << std::setw(FW-2) << ((double)(clock()-t0))/CLOCKS_PER_SEC
<< std::endl;
......
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