Commit fa9e271d authored by ehebrard's avatar ehebrard
Browse files

ttt

parent 196d5a9f
......@@ -4,9 +4,8 @@ import blossom
opt = blossom.parse(bfs.to_str_vec(sys.argv))
filename = str(opt.instance_file)
wood = blossom.Wood()
# wood = blossom.WoodI()
dataset = blossom.WeightedDataset()
algo = blossom.BacktrackingAlgo(wood, opt)
if filename == "":
print("No input file!")
......@@ -15,7 +14,10 @@ else:
blossom.read_binary(dataset, opt)
dataset.preprocess()
dataset.setup(algo)
algo = blossom.BacktrackingAlgo(datset, opt)
# dataset.setup(algo)
algo.minimize_error()
tree = algo.getSolution()
......
......@@ -175,11 +175,11 @@ namespace blossom {
/* void addBitsetExample(const dynamic_bitset<> &sample, const bool y, const size_t weight);*/
};
%template(WoodI) Wood<int>;
/* %template(WoodI) Wood<int>;
%template(WoodD) Wood<double>;
%template(TreeI) Tree<int>;
%template(TreeD) Tree<double>;
%template(TreeD) Tree<double>;*/
%template(WeightedDatasetI) WeightedDataset<int>;
......
Supports Markdown
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