Skip to content

Commit 559bad7

Browse files
committed
Merge branch 'master' into introduce_transform_convert_parallelly
2 parents 773ca2b + c8f98ed commit 559bad7

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ Container without(T elem, const Container& xs)
5454
5555
The function resides in `./include/fplus/filter.hpp`, because, well, it is some kind of filter. ;)
5656
57-
Every public exposed function (so everything not in `namespace internal`) should have an `API search type`. So the `./api_search/compile_all_and_deploy.sh` can parse the type and show it on the [website](http://www.editgym.com/fplus-api-search/). It will be run by a website admin after merging your pull request
57+
Every public exposed function (so everything not in `namespace internal`) should have an `API search type`. So the `./api_search/compile_all_and_deploy.sh` can parse the type and show it on the [website](http://www.daiw.de/fplus-api-search/). It will be run by a website admin after merging your pull request
5858
5959
If it makes sense to have a partially curried version of your function in `namespace fwd` for forward application and composition (data parameter as the last one), you should specify a `fwd bind count`. If your functions type is `foo : (a, b, c) -> d` then `generate/auto_generate.py` will insert a derived function `fwd::foo : (a, b) -> (c -> d)` into `./include/fplus/fwd_instances.autogenerated_defines`
6060
6161
The `make` step will automatically call `python ./generate/auto_generate.py`, which will update the `fwd_instances.autogenerated_defines` file, as well as the amalgamated library in `include_all_in_one/include/fplus/fplus.hpp`.
6262
63-
As the maintainer, I will run `cd api_search && ./compile_all_and_deploy.sh && cd ..` once your pull request has been merged, in order to update the doc at http://www.editgym.com/fplus-api-search/.
63+
As the maintainer, I will run `cd api_search && ./compile_all_and_deploy.sh && cd ..` once your pull request has been merged, in order to update the doc at http://www.daiw.de/fplus-api-search/.
6464
6565
6666
A few unit tests would also be nice. In our example they belong into `./test/filter_test.cpp`

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ By the way, in case you need the parameters of a binary function in reverse orde
287287

288288
Finding the functions you need
289289
------------------------------
290-
If you are looking for a specific FunctionalPlus function you do not know the name of yet, you can of course use the auto-complete feature of your IDE to browse the content of the `namespace fplus`. But the recommended way is to use the **[FunctionalPlus API search website](http://www.editgym.com/fplus-api-search/)**. You can quickly search by keywords or function type signatures with it. If you prefer, you can also [browse the source code using Sourcegraph](https://sourcegraph.com/github.com/Dobiasd/FunctionalPlus/-/tree/include/fplus).
290+
If you are looking for a specific FunctionalPlus function you do not know the name of yet, you can of course use the auto-complete feature of your IDE to browse the content of the `namespace fplus`. But the recommended way is to use the **[FunctionalPlus API search website](http://www.daiw.de/fplus-api-search/)**. You can quickly search by keywords or function type signatures with it. If you prefer, you can also [browse the source code using Sourcegraph](https://sourcegraph.com/github.com/Dobiasd/FunctionalPlus/-/tree/include/fplus).
291291

292292

293293
Performance
@@ -340,7 +340,7 @@ const auto result_range_v3 =
340340
```
341341
342342
There are some differences though. Range-v3 ranges are lazy, which means no intermediate memory is allocated during the single steps of a processing chain like the above.
343-
When using FunctionalPlus on the other hand you work with normal STL containers. Also [implementing a new function](https://github.com/Dobiasd/FunctionalPlus/blob/a17fc716d40a4370eed13f16e7d9105c4cc75e26/include/fplus/generate.hpp#L19) is simpler compared to [writing a new range adaptor](https://github.com/ericniebler/range-v3/blob/4cfcb59c3db1c279d72c64ccf15de3c724a0362d/include/range/v3/algorithm/generate.hpp#L32). Additionally FunctionalPlus provides much more functions out of the box and has the [API search website](http://www.editgym.com/fplus-api-search/). So the choice between the two libraries depends on your preferences and the project's needs.
343+
When using FunctionalPlus on the other hand you work with normal STL containers. Also [implementing a new function](https://github.com/Dobiasd/FunctionalPlus/blob/a17fc716d40a4370eed13f16e7d9105c4cc75e26/include/fplus/generate.hpp#L19) is simpler compared to [writing a new range adaptor](https://github.com/ericniebler/range-v3/blob/4cfcb59c3db1c279d72c64ccf15de3c724a0362d/include/range/v3/algorithm/generate.hpp#L32). Additionally FunctionalPlus provides much more functions out of the box and has the [API search website](http://www.daiw.de/fplus-api-search/). So the choice between the two libraries depends on your preferences and the project's needs.
344344
345345
346346
Requirements and Installation

0 commit comments

Comments
 (0)