Permalink
Browse files

Merge pull request #18 from steinwurf/update-kodo

Upgrade to kodo-rlnc 4
  • Loading branch information...
petya2164 committed Oct 3, 2016
2 parents b8025ab + 2026b01 commit 681fcc0fd2af916d9dd99584e25d1ac05bbf608b
View
@@ -6,6 +6,8 @@ of every change, see the Git log.
Latest
------
* Major: Upgrade to kodo-rlnc 4
* Major: Removed kodo dependency
* Major: Upgrade to waf-tools 3
* Major: Upgrade to boost 2
* Major: Upgrade to tables 6
View
@@ -15,7 +15,7 @@
#include <boost/random/mersenne_twister.hpp>
#include <kodo/rlnc/full_vector_codes.hpp>
#include <kodo_rlnc/full_vector_codes.hpp>
// Helper function to convert to string
template<class T>
@@ -27,14 +27,14 @@ std::string to_string(T t)
}
// The encoders and decoders that we use from the Kodo library
typedef kodo::rlnc::full_vector_encoder<fifi::binary> Encoder;
typedef kodo::rlnc::full_vector_decoder<fifi::binary> Decoder;
typedef kodo_rlnc::full_vector_encoder<fifi::binary> Encoder;
typedef kodo_rlnc::full_vector_decoder<fifi::binary> Decoder;
typedef kodo::rlnc::full_vector_encoder<fifi::binary8> Encoder8;
typedef kodo::rlnc::full_vector_decoder<fifi::binary8> Decoder8;
typedef kodo_rlnc::full_vector_encoder<fifi::binary8> Encoder8;
typedef kodo_rlnc::full_vector_decoder<fifi::binary8> Decoder8;
typedef kodo::rlnc::full_vector_encoder<fifi::binary16> Encoder16;
typedef kodo::rlnc::full_vector_decoder<fifi::binary16> Decoder16;
typedef kodo_rlnc::full_vector_encoder<fifi::binary16> Encoder16;
typedef kodo_rlnc::full_vector_decoder<fifi::binary16> Decoder16;
// The simple butterfly simulation for the following topology:
// +--------+
View
@@ -7,4 +7,4 @@ bld.program(
source=['butterfly.cpp'],
target='butterfly',
includes='..',
use=['kodo_includes', 'gauge'])
use=['kodo_rlnc_includes', 'gauge'])
View
@@ -3,15 +3,13 @@
import os, sys, urllib2, traceback
project_name = 'basic_simulations'
project_name = 'kodo_basic_simulations'
project_dependencies = \
[
'waf-tools',
'gtest',
'boost',
'sak',
'fifi',
'kodo',
'kodo-rlnc',
]
# Importing a dynamically generated module
@@ -13,7 +13,7 @@
#include <gauge/console_printer.hpp>
#include <gauge/csv_printer.hpp>
#include <kodo/rlnc/full_vector_codes.hpp>
#include <kodo_rlnc/full_vector_codes.hpp>
// Helper function to convert to string
template<class T>
@@ -25,14 +25,14 @@ std::string to_string(T t)
}
// The encoders and decoders that we use from the Kodo library
typedef kodo::rlnc::full_vector_encoder<fifi::binary> Encoder;
typedef kodo::rlnc::full_vector_decoder<fifi::binary> Decoder;
typedef kodo_rlnc::full_vector_encoder<fifi::binary> Encoder;
typedef kodo_rlnc::full_vector_decoder<fifi::binary> Decoder;
typedef kodo::rlnc::full_vector_encoder<fifi::binary8> Encoder8;
typedef kodo::rlnc::full_vector_decoder<fifi::binary8> Decoder8;
typedef kodo_rlnc::full_vector_encoder<fifi::binary8> Encoder8;
typedef kodo_rlnc::full_vector_decoder<fifi::binary8> Decoder8;
typedef kodo::rlnc::full_vector_encoder<fifi::binary16> Encoder16;
typedef kodo::rlnc::full_vector_decoder<fifi::binary16> Decoder16;
typedef kodo_rlnc::full_vector_encoder<fifi::binary16> Encoder16;
typedef kodo_rlnc::full_vector_decoder<fifi::binary16> Decoder16;
// The simple relay simulation for the following topology:
//
@@ -203,7 +203,8 @@ class relay_simulation : public gauge::benchmark
cs.set_value<double>("error_relay_sink", error_relay_sink);
cs.set_value<uint32_t>("relays", relays);
cs.set_value<bool>("source_systematic", source_systematic);
cs.set_value<bool>("relay_transmit_on_receive", relay_transmit_on_receive);
cs.set_value<bool>(
"relay_transmit_on_receive", relay_transmit_on_receive);
cs.set_value<bool>("recode", recode);
add_configuration(cs);
@@ -229,36 +230,31 @@ BENCHMARK_OPTION(relay_line)
gauge::po::options_description options("relay line");
auto default_symbols =
gauge::po::value<uint32_t>()->default_value(
32);
gauge::po::value<uint32_t>()->default_value(32);
options.add_options()
("symbols", default_symbols, "Set symbols");
auto default_symbol_size =
gauge::po::value<uint32_t>()->default_value(
1400);
gauge::po::value<uint32_t>()->default_value(1400);
options.add_options()
("symbol_size", default_symbol_size, "Set symbols size");
auto default_error_source_sink =
gauge::po::value<double>()->default_value(
0.5);
gauge::po::value<double>()->default_value(0.5);
options.add_options()
("error_source_sink", default_error_source_sink, "Error source to sink");
auto default_error_source_relay =
gauge::po::value<double>()->default_value(
0.5);
gauge::po::value<double>()->default_value(0.5);
options.add_options()
("error_source_relay", default_error_source_relay, "Error source to relay");
auto default_error_relay_sink =
gauge::po::value<double>()->default_value(
0.5);
gauge::po::value<double>()->default_value(0.5);
options.add_options()
("error_relay_sink", default_error_relay_sink, "Error relay to sink");
@@ -7,4 +7,4 @@ bld.program(
source=['relay_simulations.cpp'],
target='relay_simulations',
includes='..',
use=['kodo_includes', 'gauge'])
use=['kodo_rlnc_includes', 'gauge'])
@@ -62,7 +62,7 @@ class basic_factory
build_source(const std::string& id)
{
auto encoder = m_encoder_factory.build();
encoder->set_const_symbols(sak::storage(m_data));
encoder->set_const_symbols(storage::storage(m_data));
auto source = std::make_shared< basic_source<Encoder> >(id, encoder);
@@ -76,7 +76,6 @@ class basic_factory
private:
std::shared_ptr<random_bool> build_random_bool(double success_probability)
{
return std::make_shared<random_bool>(std::ref(m_random_generator),
View
@@ -10,10 +10,10 @@
#include <string>
#include <tables/table.hpp>
#include <kodo/has_set_systematic_off.hpp>
#include <kodo/has_set_systematic_on.hpp>
#include <kodo/set_systematic_off.hpp>
#include <kodo/set_systematic_on.hpp>
#include <kodo_core/has_set_systematic_off.hpp>
#include <kodo_core/has_set_systematic_on.hpp>
#include <kodo_core/set_systematic_off.hpp>
#include <kodo_core/set_systematic_on.hpp>
#include "packet.hpp"
#include "source.hpp"
@@ -50,14 +50,14 @@ class basic_source : public source
void systematic_off()
{
if (kodo::has_set_systematic_off<Encoder>::value)
kodo::set_systematic_off(*m_encoder);
if (kodo_core::has_set_systematic_off<Encoder>::value)
kodo_core::set_systematic_off(*m_encoder);
}
void systematic_on()
{
if (kodo::has_set_systematic_on<Encoder>::value)
kodo::set_systematic_on(*m_encoder);
if (kodo_core::has_set_systematic_on<Encoder>::value)
kodo_core::set_systematic_on(*m_encoder);
}
void store_run(tables::table& results)
View
@@ -5,7 +5,7 @@
#pragma once
#include <kodo/rlnc/full_vector_codes.hpp>
#include <kodo_rlnc/full_vector_codes.hpp>
#include <boost/random/mersenne_twister.hpp>
#include <boost/random/bernoulli_distribution.hpp>
#include <boost/variant.hpp>
View
@@ -29,9 +29,9 @@ def resolve(ctx):
major=2))
ctx.add_dependency(resolve.ResolveVersion(
name='kodo',
git_repository='github.com/steinwurf/kodo.git',
major=32))
name='kodo-rlnc',
git_repository='github.com/steinwurf/kodo-rlnc.git',
major=4))
ctx.add_dependency(resolve.ResolveVersion(
name='tables',

0 comments on commit 681fcc0

Please sign in to comment.