Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add random function for gcode macros. #5219

Merged
merged 4 commits into from
Dec 9, 2020
Merged

Add random function for gcode macros. #5219

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
888cdf8
Merge pull request #1 from prusa3d/master
ardenpm Oct 23, 2020
e4fc220
Merge pull request #2 from prusa3d/master
ardenpm Nov 21, 2020
510765b
Merge pull request #3 from prusa3d/master
ardenpm Nov 22, 2020
003ccf3
Add a new macro function `random(min,max)` which will return a random…
ardenpm Nov 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions src/libslic3r/PlaceholderParser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include <iomanip>
#include <sstream>
#include <map>
#include <random>
#ifdef _MSC_VER
#include <stdlib.h> // provides **_environ
#else
Expand Down Expand Up @@ -495,9 +496,22 @@ namespace client
static void leq (expr &lhs, expr &rhs) { compare_op(lhs, rhs, '>', true ); }
static void geq (expr &lhs, expr &rhs) { compare_op(lhs, rhs, '<', true ); }

// Random number generators
static int random_int(int min, int max) {
thread_local static std::mt19937 engine(std::random_device{}());
thread_local static std::uniform_int_distribution<int> dist;
return dist(engine, decltype(dist)::param_type{ min, max });
}
static double random_double(double min, double max) {
thread_local static std::mt19937 engine(std::random_device{}());
thread_local static std::uniform_real_distribution<double> dist;
return dist(engine, decltype(dist)::param_type{ min, max });
}

enum Function2ParamsType {
FUNCTION_MIN,
FUNCTION_MAX,
FUNCTION_RANDOM,
};
// Store the result into param1.
static void function_2params(expr &param1, expr &param2, Function2ParamsType fun)
Expand All @@ -510,6 +524,7 @@ namespace client
switch (fun) {
case FUNCTION_MIN: d = std::min(param1.as_d(), param2.as_d()); break;
case FUNCTION_MAX: d = std::max(param1.as_d(), param2.as_d()); break;
case FUNCTION_RANDOM: d = random_double(param1.as_d(), param2.as_d()); break;
default: param1.throw_exception("Internal error: invalid function");
}
param1.data.d = d;
Expand All @@ -519,6 +534,7 @@ namespace client
switch (fun) {
case FUNCTION_MIN: i = std::min(param1.as_i(), param2.as_i()); break;
case FUNCTION_MAX: i = std::max(param1.as_i(), param2.as_i()); break;
case FUNCTION_RANDOM: i = random_int(param1.as_i(), param2.as_i()); break;
default: param1.throw_exception("Internal error: invalid function");
}
param1.data.i = i;
Expand All @@ -528,6 +544,7 @@ namespace client
// Store the result into param1.
static void min(expr &param1, expr &param2) { function_2params(param1, param2, FUNCTION_MIN); }
static void max(expr &param1, expr &param2) { function_2params(param1, param2, FUNCTION_MAX); }
static void random(expr &param1, expr &param2) { function_2params(param1, param2, FUNCTION_RANDOM); }

static void regex_op(expr &lhs, boost::iterator_range<Iterator> &rhs, char op)
{
Expand Down Expand Up @@ -1173,6 +1190,8 @@ namespace client
[ px::bind(&expr<Iterator>::min, _val, _2) ]
| (kw["max"] > '(' > conditional_expression(_r1) [_val = _1] > ',' > conditional_expression(_r1) > ')')
[ px::bind(&expr<Iterator>::max, _val, _2) ]
| (kw["random"] > '(' > conditional_expression(_r1) [_val = _1] > ',' > conditional_expression(_r1) > ')')
[ px::bind(&expr<Iterator>::random, _val, _2) ]
| (kw["int"] > '(' > unary_expression(_r1) > ')') [ px::bind(&FactorActions::to_int, _1, _val) ]
| (strict_double > iter_pos) [ px::bind(&FactorActions::double_, _1, _2, _val) ]
| (int_ > iter_pos) [ px::bind(&FactorActions::int_, _1, _2, _val) ]
Expand Down Expand Up @@ -1209,6 +1228,7 @@ namespace client
("false")
("min")
("max")
("random")
("not")
("or")
("true");
Expand Down