Commit Graph

Select branches

Hide Pull Requests

CIDR4_merge_algorithm

main

output-text-files

#2

#2

#5

#6

#7

Mono Color

• 8d27a4ba61 Change usage main fedor 2026-01-11 12:01:50 +03:00
• 4726cbf7ec Move project to src structure fedor 2026-01-04 12:01:55 +03:00
• 50a298da20 Add usage examples fedor 2026-01-03 13:06:33 +03:00
• f4f6856a00 Setup dev tools with uv fedor 2026-01-03 10:54:26 +03:00
• 1c61d6b97d Merge pull request #5 from Fedor-Lyanguzov/CIDR4_merge_algorithm Fedor Lyanguzov 2025-01-27 22:05:38 +03:00
• 7024503699 add cosmetic changes CIDR4_merge_algorithm Pavel Patsey 2025-01-26 19:10:21 +03:00
• 37ffec0558 move util tests to their own file Pavel Patsey 2025-01-26 19:09:09 +03:00
• 98583a7101 make the algorithm a little faster Pavel Patsey 2025-01-26 19:03:00 +03:00
• be9d603bf8 add individual exceptions Pavel Patsey 2025-01-26 18:58:17 +03:00
• 14c8e66f60 remove unnecessary function Pavel Patsey 2025-01-26 11:07:41 +03:00
• 3e6c8525c4 remove unnecessary annotations Pavel Patsey 2025-01-26 11:05:19 +03:00
• 6f745c2d61 remove unnecessary annotations Pavel Patsey 2025-01-26 11:04:23 +03:00
• 0b56caffac fix tests after removing functions Pavel Patsey 2025-01-26 10:52:45 +03:00
• a4991518ba move internal functions to the function where they are used Pavel Patsey 2025-01-26 10:48:08 +03:00
• e0ecafa9d0 changed the order of functions Pavel Patsey 2025-01-26 10:45:05 +03:00
• 52c5fb679e rename merge_nodes function to solution Pavel Patsey 2025-01-26 10:39:31 +03:00
• 04b4d14a30 shorten variable names in merge_nodes function Pavel Patsey 2025-01-26 10:30:58 +03:00
• fee38af690 shorten variable names in merge_two_nodes function Pavel Patsey 2025-01-26 10:27:55 +03:00
• 731d77f0e3 shorten variable names in calc_dip function Pavel Patsey 2025-01-26 10:24:34 +03:00
• fa9b4073b7 move how to launch algorithms info to the folder with algorithms Pavel Patsey 2025-01-26 10:04:37 +03:00
• bc8ddf1be4 add insurance functions, delete raise exception from find_parent function Pavel Patsey 2025-01-25 10:28:03 +03:00
• eccc03f48d add cosmetic changes (more comfortable work with arguments) Pavel Patsey 2025-01-25 10:15:42 +03:00
• 735a3c0216 take into account the case when neighbors could remain Pavel Patsey 2025-01-24 14:01:47 +03:00
• f9f711ca0b add insurance functions example Pavel Patsey 2025-01-24 13:49:00 +03:00
• 811432a2f5 add cosmetic changes in merge_two_nodes Pavel Patsey 2025-01-24 13:34:47 +03:00
• 75d400f52e add find subnets example Pavel Patsey 2025-01-24 13:30:37 +03:00
• 6c43344893 make calc_dip faster Pavel Patsey 2025-01-24 12:13:55 +03:00
• 68327db96c fix tests (delete sort_nodes from tests) Pavel Patsey 2025-01-24 11:59:35 +03:00
• a160ffd3a2 add cosmetic changes Pavel Patsey 2025-01-24 11:38:17 +03:00
• 7c8ecea980 delete sort nodes function Pavel Patsey 2025-01-24 11:36:34 +03:00
• 55c71c6eb2 use functions from util Pavel Patsey 2025-01-24 11:35:03 +03:00
• f40d47989a make similar output Pavel Patsey 2025-01-24 11:31:12 +03:00
• d987b39bbd add merge_nodes function Pavel Patsey 2025-01-24 10:05:11 +03:00
• 91d3556eee fix calc_dip, add merge_two_nodes Pavel Patsey 2025-01-23 18:34:13 +03:00
• adc569af21 fix calc_dip Pavel Patsey 2025-01-23 10:20:36 +03:00
• 474b6779d8 add calc_dip function Pavel Patsey 2025-01-23 10:15:30 +03:00
• 81f741ee4e fix plan Pavel Patsey 2025-01-23 09:42:30 +03:00
• 5a8f98041f correct mask recalculation when reducing its length Pavel Patsey 2025-01-22 23:27:47 +03:00
• 725b80544a add find_parent function Pavel Patsey 2025-01-22 23:12:21 +03:00
• faa2849e6b fix sort nodes test Pavel Patsey 2025-01-22 22:25:09 +03:00
• d591470a0d correct the algorithm plan Pavel Patsey 2025-01-22 22:04:47 +03:00
• 05c78ad399 delete added_ips_number info from node Pavel Patsey 2025-01-22 21:56:19 +03:00
• c659e96d3f add cidr4_merger algorithm to the others Pavel Patsey 2025-01-22 21:47:31 +03:00
• 3ff3843b58 delete unnecessary test data Pavel Patsey 2025-01-22 18:58:18 +03:00
• 8229e91fe6 Merge pull request #7 from Fedor-Lyanguzov/cma-two-versions Pavel Patsey 2025-01-22 18:49:05 +03:00
• 6634643155 init new algorithm Pavel Patsey 2025-01-22 18:23:02 +03:00
• dfd6e21f2b Fast and precise algorithms, with tests Fedor Lyanguzov 2025-01-22 18:21:39 +03:00
• 2cab2c31a6 add current solution to archive before changes Pavel Patsey 2025-01-22 17:49:20 +03:00
• 303ddee08f remove unnecessary copying of node list Pavel Patsey 2025-01-19 01:45:25 +03:00
• 7600814772 add test merge_nodes recursion vs cycle Pavel Patsey 2025-01-19 01:24:08 +03:00
• 39e99d24b6 add merge_nodes_cycle func Pavel Patsey 2025-01-19 01:00:01 +03:00
• 8ce8ac6e1a rename prev merge_nodes func to merge_nodes_deprecated Pavel Patsey 2025-01-19 00:46:00 +03:00
• 1d34eb92bd add working recursive merge algorithm Pavel Patsey 2025-01-19 00:42:13 +03:00
• c5e20446be add merge_nodes_recursion test Pavel Patsey 2025-01-19 00:29:54 +03:00
• 724e8f8471 add lift_lonely_node test Pavel Patsey 2025-01-19 00:27:42 +03:00
• 71b5525c32 fix merge_neighbors and add merge_neighbors tests Pavel Patsey 2025-01-19 00:19:04 +03:00
• 58c2b5cbe0 add fixtures for nodes and groups Pavel Patsey 2025-01-19 00:05:21 +03:00
• 95fbdff75f add find_neighbours_singles function test Pavel Patsey 2025-01-18 23:54:00 +03:00
• c56d09cfd9 extended the make_groups function test Pavel Patsey 2025-01-18 23:52:28 +03:00
• a42f459db4 add test make_groups Pavel Patsey 2025-01-18 23:19:04 +03:00
• feda229c78 add non-working recursive merge algorithm Pavel Patsey 2025-01-18 23:17:47 +03:00
• af91a066a1 rename ip_str to ip_address Pavel Patsey 2025-01-18 20:24:04 +03:00
• b5a1498a51 add parent_ip info to Node tuple Pavel Patsey 2025-01-18 20:15:21 +03:00
• edcce93d01 rename test ips Pavel Patsey 2025-01-16 15:18:08 +03:00
• a1dba6affb move tests to a separate file Pavel Patsey 2025-01-16 15:12:30 +03:00
• dd90ad624a use tuple opening, use only necessary arguments in functions, delete data_to_nodes function Pavel Patsey 2025-01-16 14:08:38 +03:00
• d1afaace68 fix tests Pavel Patsey 2025-01-16 12:42:18 +03:00
• 048d4941e4 format by black and isort Pavel Patsey 2025-01-16 12:41:52 +03:00
• 5f0353d574 2025-01-12 обсуждение кода Fedor Lyanguzov 2025-01-12 18:53:24 +03:00
• 5ef04aefdf cleanup Павел 2025-01-12 00:00:33 +03:00
• 9d5c6b384a add algorithm Павел 2025-01-11 23:59:29 +03:00
• c4c5940f8d cosmetic changes Павел 2025-01-11 22:40:23 +03:00
• aa75fd7ba6 cleanup Павел 2025-01-11 22:39:23 +03:00
• 5a4166095b add reduce_nodes function Павел 2025-01-11 22:30:08 +03:00
• 020836d33d add sort_nodes func Павел 2025-01-11 14:40:21 +03:00
• 3a5a195d3d add have_same_parent func Павел 2025-01-11 09:45:35 +03:00
• 9377d23134 add convert data to nodes Павел 2025-01-11 08:08:08 +03:00
• dfd02e3da5 add convert from cidr4 to node Павел 2025-01-11 07:24:48 +03:00
• 9148b9be32 init new algorithm Павел 2025-01-11 07:00:22 +03:00
• 795e22c043 Add little type annotations output-text-files Fedor Lyanguzov 2025-01-09 17:38:11 +03:00
• 113b651167 speed up remove_ips_with_subnets function Павел 2025-01-09 14:19:00 +03:00
• 99da7ea726 cleanup Павел 2025-01-09 13:46:59 +03:00
• 722bd5a751 add remove_ips_with_subnets function and really fix merge functions Павел 2025-01-09 13:00:37 +03:00
• 7d89eee92f fix rough_merge_binaries funс, previously the function returned networks and subnets Павел 2025-01-09 01:09:29 +03:00
• d514d4f5e0 added smooth_merge_binaries function Павел 2025-01-08 23:13:57 +03:00
• fab8786ff8 cleanup Павел 2025-01-08 22:30:13 +03:00
• 604861aa80 refactoring: represent binary ip as a string of length 32 Павел 2025-01-08 22:29:17 +03:00
• ddcb043caa refactoring: represent binary as a string of vlsm length Павел 2025-01-08 21:16:00 +03:00
• 44893da6a8 fix merge conflicts Павел 2025-01-08 19:25:28 +03:00
• bb269f380a add rough_merge_ips function Павел 2025-01-08 19:21:44 +03:00
• 8b2727ca38 Test intersecting cidrs will combine Fedor Lyanguzov 2025-01-08 13:18:58 +03:00
• c9c53941ee add reduce_bin_ip function Павел 2025-01-08 12:38:06 +03:00
• 76f2710f70 fix cidr4_to_binary function Павел 2025-01-08 12:20:22 +03:00
• f7156fb61d added convert functions Павел 2025-01-08 12:16:13 +03:00
• 2a4418fccc added cidr list merge algorithm Павел 2025-01-07 17:35:23 +03:00
• e901b4e528 init cidr4_merger Павел 2025-01-07 13:28:07 +03:00
• 1895a112b0 add .idea to gitignore Павел 2025-01-07 12:55:49 +03:00
• 1b37f1b57d neatest way to write multiline f-strings (not fast though) Fedor Lyanguzov 2024-12-28 19:35:37 +03:00
• 9e3f16175a add support for pyproject.toml to flake8 Fedor Lyanguzov 2024-12-28 19:17:03 +03:00
• 02a4f590f2 work around relative imports Fedor Lyanguzov 2024-12-28 18:50:30 +03:00