Optimizer because that's fun lmao

diff --git a/Makefile b/Makefile
index a4f0a04ad724a47f0979572ac997418c8e916d9c..33bd73b2f8a4a574df39d209d58a4a5d2825032a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 NAME=push_swap
 
-SRCS=algorithm_quicksort.c cheatalloc.c clist.c list.c main_pushswap.c ops.c ops_output.c ops_p.c ops_r.c ops_rr.c ops_s.c output.c psval.c stack.c stacks.c
+SRCS=algorithm_quicksort.c cheatalloc.c clist.c list.c main_pushswap.c op_output.c op_p.c op_r.c op_rr.c op_s.c ops.c ops_groups.c ops_optimizer.c output.c psval.c stack.c stacks.c
 
 OBJS=${SRCS:%.c=${OBJDIR}/%.o}
 
@@ -26,7 +26,7 @@ clean :
 
 fclean : clean
        rm -f ${NAME}
-       rmdir ${OBJDIR}
+       rm -fd ${OBJDIR}
 
 re : fclean all
 

diff --git a/algorithm_quicksort.c b/algorithm_quicksort.c
index 05c62dce9071f42d0fe244a67591469b95540ebd..ed5cf4493c1b98199ac3469628445dd87a3cb0bc 100644 (file)
--- a/algorithm_quicksort.c
+++ b/algorithm_quicksort.c
@@ -6,7 +6,7 @@
 /*   By: agilliar <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/12/05 19:07:14 by agilliar          #+#    #+#             */
-/*   Updated: 2025/12/08 14:02:02 by agilliar         ###   ########.fr       */
+/*   Updated: 2025/12/08 17:57:01 by agilliar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -41,7 +41,7 @@ static void   quicksort_rec(const t_stacks *stacks, t_closure cb, t_list range)
        size_t  i;
        size_t  pivot;
 
-       if (range.len == 2 
+       if (range.len == 2
                && clist_get_at(stacks->a.list, 0) > clist_get_at(stacks->a.list, -1))
                (cb.func)(cb.data, OP_SA);
        if (range.len <= 2)

diff --git a/list.c b/list.c
index 56becd4cb5cb071bbe0b06051e87ac7f1349a14a..92d8026087580431c800eb4a6a9ff590392aa4c0 100644 (file)
--- a/list.c
+++ b/list.c
@@ -6,7 +6,7 @@
 /*   By: agilliar <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/12/08 11:32:24 by agilliar          #+#    #+#             */
-/*   Updated: 2025/12/08 13:02:46 by agilliar         ###   ########.fr       */
+/*   Updated: 2025/12/08 17:57:16 by agilliar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -20,7 +20,7 @@ t_list        list_new(t_stack stack)
        res.ptr = cheatalloc(sizeof(t_psval) * stack.len);
        res.len = stack.len;
        i = 0;
-       while(i < res.len)
+       while (i < res.len)
        {
                res.ptr[i++] = stack.list->val;
                stack.list = stack.list->prev;

diff --git a/main_pushswap.c b/main_pushswap.c
index 021f5c590579258363c7b17f2bece13dff9a8085..b5610a2d5f32ef31f558f2766e70150fd8298e63 100644 (file)
--- a/main_pushswap.c
+++ b/main_pushswap.c
@@ -6,7 +6,7 @@
 /*   By: clefrere <clefrere@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/12/02 22:15:12 by agilliar          #+#    #+#             */
-/*   Updated: 2025/12/08 14:02:08 by agilliar         ###   ########.fr       */
+/*   Updated: 2025/12/08 20:22:37 by agilliar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -22,7 +22,6 @@ static bool   ft_streq(char *str1, char *str2)
        return (str1[i] == '\0' && str2[i] == '\0');
 }
 
-
 static void    arg_step(char *str, t_args *arg)
 {
        if (ft_streq(str, "--simple"))
@@ -41,17 +40,18 @@ static void arg_step(char *str, t_args *arg)
 
 int    main(int argc, char **argv)
 {
-       t_args  args;
-       t_ops   ops;
+       t_args          args;
+       t_ops           ops;
+       t_optimizer     opt;
 
        args.state = stacks_new();
        args.bench = false;
        args.algo = NULL;
        for (int i = 1; i < argc; i++)
                arg_step(argv[i], &args);
-       ops = ops_init();
-       ops_add_output(&ops);
+       ops = ops_compose(ops_stackops(), ops_optimizer(ops_output(), &opt));
        stacks_apply(&args.state, &ops, args.algo);
+       ops_optimizer_commit(&opt, &args.state);
        output_flush();
        cheatexit(!stacks_is_solved(&args.state));
 }

diff --git a/ops_output.c b/op_output.c
similarity index 80%
rename from ops_output.c
rename to op_output.c
index b245dfc9e79adc5133b45824ce4da8ecd6d6bf39..ddfec2998ba6f4a3bc0963a45b8cfa71437b7da0 100644 (file)
--- a/ops_output.c
+++ b/op_output.c
@@ -1,24 +1,24 @@
 /* ************************************************************************** */
 /*                                                                            */
 /*                                                        :::      ::::::::   */
-/*   ops_output.c                                       :+:      :+:    :+:   */
+/*   op_output.c                                        :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
 /*   By: agilliar <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/12/03 12:28:28 by agilliar          #+#    #+#             */
-/*   Updated: 2025/12/03 15:01:10 by agilliar         ###   ########.fr       */
+/*   Updated: 2025/12/08 18:40:54 by agilliar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "pushswap.h"
 
-static void    ops_output_inner(const char *data, t_stack stack)
+static void    op_output_inner(const char *data, t_stack *stack)
 {
        (void) stack;
        output_str_ln(data);
 }
 
-t_closure      ops_output(t_op op)
+t_closure      op_output(t_op op)
 {
        t_closure       res;
        static char     *ops[11] = {
@@ -36,6 +36,6 @@ t_closure     ops_output(t_op op)
        };
 
        res.data = ops[op];
-       res.func = &ops_output_inner;
+       res.func = &op_output_inner;
        return (res);
 }

diff --git a/ops_p.c b/op_p.c
similarity index 75%
rename from ops_p.c
rename to op_p.c
index 5b9ee38f8e59386a216de15ae9c938259776bfba..f822d204381c876595787b5000048836606e24e7 100644 (file)
--- a/ops_p.c
+++ b/op_p.c
@@ -1,45 +1,45 @@
 /* ************************************************************************** */
 /*                                                                            */
 /*                                                        :::      ::::::::   */
-/*   ops_p.c                                            :+:      :+:    :+:   */
+/*   op_p.c                                             :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
 /*   By: agilliar <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/12/03 13:20:25 by agilliar          #+#    #+#             */
-/*   Updated: 2025/12/08 12:49:35 by agilliar         ###   ########.fr       */
+/*   Updated: 2025/12/08 17:39:12 by agilliar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "pushswap.h"
 
-static void    ops_pa_inner(void *data, t_stacks *stacks)
+static void    op_pa_inner(void *data, t_stacks *stacks)
 {
        (void) data;
        if (stacks->b.len)
                stack_move(&stacks->b, &stacks->a);
 }
 
-t_closure      ops_pa(void)
+t_closure      op_pa(void)
 {
        t_closure       res;
 
        res.data = NULL;
-       res.func = &ops_pa_inner;
+       res.func = &op_pa_inner;
        return (res);
 }
 
-static void    ops_pb_inner(void *data, t_stacks *stacks)
+static void    op_pb_inner(void *data, t_stacks *stacks)
 {
        (void) data;
        if (stacks->a.len)
                stack_move(&stacks->a, &stacks->b);
 }
 
-t_closure      ops_pb(void)
+t_closure      op_pb(void)
 {
        t_closure       res;
 
        res.data = NULL;
-       res.func = &ops_pb_inner;
+       res.func = &op_pb_inner;
        return (res);
 }

diff --git a/ops_r.c b/op_r.c
similarity index 71%
rename from ops_r.c
rename to op_r.c
index 69fb078a560af00c4d048fd415c9c3ea36f35b4d..856fc1dd2e157de85efb50567c5c0f612b5c91a6 100644 (file)
--- a/ops_r.c
+++ b/op_r.c
@@ -1,48 +1,48 @@
 /* ************************************************************************** */
 /*                                                                            */
 /*                                                        :::      ::::::::   */
-/*   ops_r.c                                            :+:      :+:    :+:   */
+/*   op_r.c                                             :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
 /*   By: agilliar <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/12/03 13:15:06 by agilliar          #+#    #+#             */
-/*   Updated: 2025/12/03 13:17:00 by agilliar         ###   ########.fr       */
+/*   Updated: 2025/12/08 17:48:17 by agilliar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "pushswap.h"
 
-static void    ops_ra_inner(void *data, t_stacks *stacks)
+static void    op_ra_inner(void *data, t_stacks *stacks)
 {
        (void) data;
        stack_rotate_n(&stacks->a, 1);
 }
 
-t_closure      ops_ra(void)
+t_closure      op_ra(void)
 {
        t_closure       res;
 
        res.data = NULL;
-       res.func = &ops_ra_inner;
+       res.func = &op_ra_inner;
        return (res);
 }
 
-static void    ops_rb_inner(void *data, t_stacks *stacks)
+static void    op_rb_inner(void *data, t_stacks *stacks)
 {
        (void) data;
        stack_rotate_n(&stacks->b, 1);
 }
 
-t_closure      ops_rb(void)
+t_closure      op_rb(void)
 {
        t_closure       res;
 
        res.data = NULL;
-       res.func = &ops_rb_inner;
+       res.func = &op_rb_inner;
        return (res);
 }
 
-t_closure      ops_rr(void)
+t_closure      op_rr(void)
 {
-       return (ops_compose(ops_ra(), ops_rb()));
+       return (op_compose(op_ra(), op_rb()));
 }

diff --git a/ops_rr.c b/op_rr.c
similarity index 70%
rename from ops_rr.c
rename to op_rr.c
index 82ae6688162a16517cfa1ce69a87995d48000f30..740506c51c1e5cdc1db6ac3340c21af6cf23241f 100644 (file)
--- a/ops_rr.c
+++ b/op_rr.c
@@ -1,48 +1,48 @@
 /* ************************************************************************** */
 /*                                                                            */
 /*                                                        :::      ::::::::   */
-/*   ops_rr.c                                           :+:      :+:    :+:   */
+/*   op_rr.c                                            :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
 /*   By: agilliar <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/12/03 13:17:23 by agilliar          #+#    #+#             */
-/*   Updated: 2025/12/08 12:41:25 by agilliar         ###   ########.fr       */
+/*   Updated: 2025/12/08 17:48:23 by agilliar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "pushswap.h"
 
-static void    ops_rra_inner(void *data, t_stacks *stacks)
+static void    op_rra_inner(void *data, t_stacks *stacks)
 {
        (void) data;
        stack_rotate_n(&stacks->a, -1);
 }
 
-t_closure      ops_rra(void)
+t_closure      op_rra(void)
 {
        t_closure       res;
 
        res.data = NULL;
-       res.func = &ops_rra_inner;
+       res.func = &op_rra_inner;
        return (res);
 }
 
-static void    ops_rrb_inner(void *data, t_stacks *stacks)
+static void    op_rrb_inner(void *data, t_stacks *stacks)
 {
        (void) data;
        stack_rotate_n(&stacks->b, -1);
 }
 
-t_closure      ops_rrb(void)
+t_closure      op_rrb(void)
 {
        t_closure       res;
 
        res.data = NULL;
-       res.func = &ops_rrb_inner;
+       res.func = &op_rrb_inner;
        return (res);
 }
 
-t_closure      ops_rrr(void)
+t_closure      op_rrr(void)
 {
-       return (ops_compose(ops_rra(), ops_rrb()));
+       return (op_compose(op_rra(), op_rrb()));
 }

diff --git a/ops_s.c b/op_s.c
similarity index 71%
rename from ops_s.c
rename to op_s.c
index 61ed41741cb8fcc896646a556feee363f2d6e74b..335c776799061994b1dbbe863405b3918bde5439 100644 (file)
--- a/ops_s.c
+++ b/op_s.c
@@ -1,48 +1,48 @@
 /* ************************************************************************** */
 /*                                                                            */
 /*                                                        :::      ::::::::   */
-/*   ops_s.c                                            :+:      :+:    :+:   */
+/*   op_s.c                                             :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
 /*   By: agilliar <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/12/03 12:28:28 by agilliar          #+#    #+#             */
-/*   Updated: 2025/12/03 13:14:52 by agilliar         ###   ########.fr       */
+/*   Updated: 2025/12/08 17:48:29 by agilliar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "pushswap.h"
 
-static void    ops_sa_inner(void *data, t_stacks *stacks)
+static void    op_sa_inner(void *data, t_stacks *stacks)
 {
        (void) data;
        stack_swap_top(&stacks->a);
 }
 
-t_closure      ops_sa(void)
+t_closure      op_sa(void)
 {
        t_closure       res;
 
        res.data = NULL;
-       res.func = &ops_sa_inner;
+       res.func = &op_sa_inner;
        return (res);
 }
 
-static void    ops_sb_inner(void *data, t_stacks *stacks)
+static void    op_sb_inner(void *data, t_stacks *stacks)
 {
        (void) data;
        stack_swap_top(&stacks->b);
 }
 
-t_closure      ops_sb(void)
+t_closure      op_sb(void)
 {
        t_closure       res;
 
        res.data = NULL;
-       res.func = &ops_sb_inner;
+       res.func = &op_sb_inner;
        return (res);
 }
 
-t_closure      ops_ss(void)
+t_closure      op_ss(void)
 {
-       return (ops_compose(ops_sa(), ops_sb()));
+       return (op_compose(op_sa(), op_sb()));
 }

diff --git a/ops.c b/ops.c
index b3a134daa77fc7f9e9f9f0a77ae07a05083be46a..eb02d59f891d1f9b19b7b309225236b0b97e58b6 100644 (file)
--- a/ops.c
+++ b/ops.c
@@ -6,61 +6,56 @@
 /*   By: agilliar <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/12/03 10:57:30 by agilliar          #+#    #+#             */
-/*   Updated: 2025/12/03 15:07:01 by agilliar         ###   ########.fr       */
+/*   Updated: 2025/12/08 17:49:07 by agilliar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "pushswap.h"
 #include "ops_inner.h"
 
-static void    ops_compose_fn(t_ops_compose *data, t_stacks *stacks)
+static void    op_compose_fn(t_op_compose *data, t_stacks *stacks)
 {
        (data->first.func)(data->first.data, stacks);
        (data->second.func)(data->second.data, stacks);
 }
 
-t_closure      ops_compose(t_closure first, t_closure second)
+t_closure      op_compose(t_closure first, t_closure second)
 {
-       t_ops_compose   *data;
+       t_op_compose    *data;
        t_closure               closure;
 
-       data = cheatalloc(sizeof(t_ops_compose));
+       data = cheatalloc(sizeof(t_op_compose));
        data->first = first;
        data->second = second;
-       closure.func = &ops_compose_fn;
+       closure.func = &op_compose_fn;
        closure.data = data;
        return (closure);
 }
 
-t_ops  ops_init(void)
+t_ops  ops_compose(t_ops lhs, t_ops rhs)
 {
-       const t_ops     res = {
-               .ops = {
-               ops_sa(),
-               ops_sb(),
-               ops_ss(),
-               ops_pa(),
-               ops_pb(),
-               ops_ra(),
-               ops_rb(),
-               ops_rr(),
-               ops_rra(),
-               ops_rrb(),
-               ops_rrr(),
-       }
-       };
+       t_ops   res;
+       t_op    op;
 
+       op = OP_SA;
+       while (op <= OP_RRR)
+       {
+               res.ops[op] = op_compose(lhs.ops[op], rhs.ops[op]);
+               op++;
+       }
        return (res);
 }
 
-void   ops_add_output(t_ops *ops)
+t_ops  ops_init(t_closure (*gen)(t_op))
 {
+       t_ops   res;
        t_op    op;
 
        op = OP_SA;
        while (op <= OP_RRR)
        {
-               ops->ops[op] = ops_compose(ops->ops[op], ops_output(op));
+               res.ops[op] = gen(op);
                op++;
        }
+       return (res);
 }

diff --git a/ops_groups.c b/ops_groups.c
new file mode 100644 (file)
index 0000000..63b7f06
--- /dev/null
+++ b/ops_groups.c
@@ -0,0 +1,39 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ops_groups.c                                       :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: agilliar <marvin@42.fr>                    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2025/12/08 17:02:23 by agilliar          #+#    #+#             */
+/*   Updated: 2025/12/08 17:56:36 by agilliar         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "pushswap.h"
+
+t_ops  ops_stackops(void)
+{
+       const t_ops     ops = {
+               .ops = {
+               op_sa(),
+               op_sb(),
+               op_ss(),
+               op_pa(),
+               op_pb(),
+               op_ra(),
+               op_rb(),
+               op_rr(),
+               op_rra(),
+               op_rrb(),
+               op_rrr(),
+       },
+       };
+
+       return (ops);
+}
+
+t_ops  ops_output(void)
+{
+       return (ops_init(op_output));
+}

diff --git a/ops_inner.h b/ops_inner.h
index 1a826ebb070d1f9d461a2299181637f5d956483a..1f57dec5155909300a6849bbb8e6ae54a9c98d8d 100644 (file)
--- a/ops_inner.h
+++ b/ops_inner.h
@@ -6,17 +6,17 @@
 /*   By: agilliar <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/12/03 11:13:51 by agilliar          #+#    #+#             */
-/*   Updated: 2025/12/03 11:14:05 by agilliar         ###   ########.fr       */
+/*   Updated: 2025/12/08 17:48:52 by agilliar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #ifndef OPS_INNER_H
 # define OPS_INNER_H
 
-typedef struct s_ops_compose
+typedef struct s_op_compose
 {
        t_closure       first;
        t_closure       second;
-}      t_ops_compose;
+}      t_op_compose;
 
 #endif

diff --git a/ops_optimizer.c b/ops_optimizer.c
new file mode 100644 (file)
index 0000000..dbfbad4
--- /dev/null
+++ b/ops_optimizer.c
@@ -0,0 +1,112 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ops_optimizer.c                                    :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: agilliar <marvin@42.fr>                    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2025/12/08 17:54:20 by agilliar          #+#    #+#             */
+/*   Updated: 2025/12/08 20:20:59 by agilliar         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "pushswap.h"
+#include "ops_optimizer_inner.h"
+
+#include <stdio.h>
+
+static void                    op_optimizer_inner(t_op_optimizer *data, t_stacks *stacks)
+{
+       t_closure       cb;
+
+       if (data->op == OP_RA || data->op == OP_RR)
+               data->opt->a++;
+       if (data->op == OP_RB || data->op == OP_RR)
+               data->opt->b++;
+       if (data->op == OP_RRA || data->op == OP_RRR)
+               data->opt->a--;
+       if (data->op == OP_RRB || data->op == OP_RRR)
+               data->opt->b--;
+       if (data->op == OP_SA || data->op == OP_SB || data->op == OP_SS
+               || data->op == OP_PA || data->op == OP_PB)
+       {
+               ops_optimizer_commit(data->opt, stacks);
+               cb = data->opt->commit.ops[data->op];
+               (cb.func)(cb.data, stacks);
+       }
+}
+
+static t_closure       op_optimizer(t_optimizer *opt, t_op op)
+{
+       t_closure               res;
+       t_op_optimizer  *data;
+
+       data = cheatalloc(sizeof(t_op_optimizer));
+       data->op = op;
+       data->opt = opt;
+       res.data = data;
+       res.func = &op_optimizer_inner;
+       return (res);
+}
+
+t_ops  ops_optimizer(t_ops commit, t_optimizer *data)
+{
+       t_ops   res;
+       t_op    op;
+
+       data->a = 0;
+       data->b = 0;
+       data->commit = commit;
+       op = OP_SA;
+       while (op <= OP_RRR)
+       {
+               res.ops[op] = op_optimizer(data, op);
+               op++;
+       }
+       return (res);
+}
+
+static void    ops_optimizer_commit_end(t_optimizer *data, t_stacks *stacks)
+{
+       t_closure       cb;
+       int64_t *counter;
+
+       cb = data->commit.ops[OP_RA];
+       if (data->b > 0)
+               cb = data->commit.ops[OP_RB];
+       if (data->a < 0)
+               cb = data->commit.ops[OP_RRA];
+       if (data->b < 0)
+               cb = data->commit.ops[OP_RRB];
+       counter = &data->a;
+       if (data->b != 0)
+               counter = &data->b;
+       if (*counter > 0)
+               *counter *= -1;
+       while (*counter != 0)
+       {
+               (cb.func)(cb.data, stacks);
+               (*counter)++;
+       }
+}
+
+void   ops_optimizer_commit(t_optimizer *data, t_stacks *stacks)
+{
+       t_closure       cb;
+
+       cb = data->commit.ops[OP_RR];
+       while (data->a > 0 && data->b > 0)
+       {
+               data->a--;
+               data->b--;
+               (cb.func)(cb.data, stacks);
+       }
+       cb = data->commit.ops[OP_RRR];
+       while (data->a < 0 && data->b < 0)
+       {
+               data->a++;
+               data->b++;
+               (cb.func)(cb.data, stacks);
+       }
+       ops_optimizer_commit_end(data, stacks);
+}

diff --git a/ops_optimizer_inner.h b/ops_optimizer_inner.h
new file mode 100644 (file)
index 0000000..abe08e5
--- /dev/null
+++ b/ops_optimizer_inner.h
@@ -0,0 +1,24 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ops_optimizer_inner.h                              :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: agilliar <marvin@42.fr>                    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2025/12/08 18:26:54 by agilliar          #+#    #+#             */
+/*   Updated: 2025/12/08 18:28:58 by agilliar         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#ifndef OPS_OPTIMIZER_INNER_H
+# define OPS_OPTIMIZER_INNER_H
+
+#include "pushswap.h"
+
+typedef struct s_op_optimizer
+{
+       t_optimizer     *opt;
+       t_op            op;
+}      t_op_optimizer;
+
+#endif

diff --git a/pushswap.h b/pushswap.h
index 5f04aeff9cc5ad891f8f87b94025659b5dbfb32b..fcbd6dde2ce9b77749a4bce88d662d8dedc4f9a3 100644 (file)
--- a/pushswap.h
+++ b/pushswap.h
@@ -6,7 +6,7 @@
 /*   By: agilliar <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/12/02 11:02:44 by agilliar          #+#    #+#             */
-/*   Updated: 2025/12/08 12:03:24 by agilliar         ###   ########.fr       */
+/*   Updated: 2025/12/08 20:14:33 by agilliar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -15,6 +15,7 @@
 
 # include <stdbool.h>
 # include <stddef.h>
+# include <stdint.h>
 
 typedef int    t_psval;
 
@@ -81,6 +82,13 @@ typedef struct s_list
        t_psval *ptr;
 }      t_list;
 
+typedef struct s_optimizer
+{
+       int64_t a;
+       int64_t b;
+       t_ops   commit;
+}      t_optimizer;
+
 void           cheatexit(int errcode);
 void           *cheatalloc(size_t len);
 
@@ -110,23 +118,29 @@ void              stack_move(t_stack *src, t_stack *dst);
 t_psval                psval_parse(const char *s);
 void           psval_output(t_psval val);
 
-t_closure      ops_pa(void);
-t_closure      ops_pb(void);
-t_closure      ops_ra(void);
-t_closure      ops_rb(void);
-t_closure      ops_rr(void);
-t_closure      ops_rra(void);
-t_closure      ops_rrb(void);
-t_closure      ops_rrr(void);
-t_closure      ops_sa(void);
-t_closure      ops_sb(void);
-t_closure      ops_ss(void);
-
-t_closure      ops_output(t_op op);
-
-t_closure      ops_compose(t_closure first, t_closure second);
-t_ops          ops_init(void);
-void           ops_add_output(t_ops *ops);
+t_closure      op_pa(void);
+t_closure      op_pb(void);
+t_closure      op_ra(void);
+t_closure      op_rb(void);
+t_closure      op_rr(void);
+t_closure      op_rra(void);
+t_closure      op_rrb(void);
+t_closure      op_rrr(void);
+t_closure      op_sa(void);
+t_closure      op_sb(void);
+t_closure      op_ss(void);
+
+t_closure      op_output(t_op op);
+
+t_closure      op_compose(t_closure first, t_closure second);
+t_ops          ops_compose(t_ops lhs, t_ops rhs);
+t_ops          ops_init(t_closure (*gen)(t_op));
+
+t_ops          ops_stackops(void);
+t_ops          ops_output(void);
+
+t_ops          ops_optimizer(t_ops commit, t_optimizer *data);
+void           ops_optimizer_commit(t_optimizer *data, t_stacks *stacks);
 
 t_list         list_new(t_stack stack);
 t_list         list_sub(t_list self, size_t start, size_t end);