@@ -16,6 +16,12 @@ let vocabulary = (FuzzySet.create_triangle 90.0 110.0) in voc + (* TODO complete the parser for vocabulary + Builder.vocabulary_from_string " + DEF BIG TRIANGLE 5.0 15.0 + DEF FAST TRIANGLE 90 110 + " + *) let create_model voc = let rules = Builder.rules_from_string voc " example/ex2.ml @@ -8,6 +8,14 @@ type is_t = type rule_t = | Imply of is_t * is_t +type def_t = + | DefByFun of + symb_t (* vocabulary term *) + * symb_t (* function name to build the fuzzy set *) + * float list (* parameters to define the term through the funtion *) + | DefByPoints of + symb_t (* vocabulary term *) + * (float * float) list (* list of points *) let indented_string indent s = Printf.sprintf "%s%s" (String.make indent ' ') s fuzlog/ast.ml @@ -29,11 +29,15 @@ let to_rule voc t = match t with (to_premisse voc s1) (to_conclusion voc s2) - let rule_ast_from_string s = let lexbuf = Lexing.from_string s in - Parser.rules Lexer.tokens lexbuf + Parser.rules Lexer.rule_tokens lexbuf let rules_from_string voc s = List.map (to_rule voc) (rule_ast_from_string s) + +let voc_ast_from_string s = + let lexbuf = Lexing.from_string s in + Parser.vocabulary Lexer.voc_tokens lexbuf + fuzlog/builder.ml @@ -11,13 +11,29 @@ let incr_lineno lexbuf = } let alphanum = ['_''a'-'z''A'-'Z''0'-'9'] +let digit = ['0'-'9'] -rule tokens = parse - | [' ' '\t'] { tokens lexbuf } - | ['\n'] { incr_lineno lexbuf; tokens lexbuf } +rule rule_tokens = parse + | [' ' '\t'] { rule_tokens lexbuf } + | ['\n'] { incr_lineno lexbuf; rule_tokens lexbuf } | "IF"|"if" { IF } | "THEN"|"then" { THEN } | "IS"|"is" { IS } | "AND"|"and" { AND } | alphanum+ as s { SYMB(s) } | eof { EOF } + +and voc_tokens = parse + | [' ' '\t'] { voc_tokens lexbuf } + | ['\n'] { incr_lineno lexbuf; voc_tokens lexbuf } + | "DEF"|"def" { DEF } + | "[" { OPENSB } + | "]" { CLOSESB } + | "(" { OPENB } + | ")" { CLOSEB } + | "-"? digit+ + | "-"? digit* "." digit+ + | "-"? digit+ "." digit* as num + { NUMBER(num) } + | alphanum+ as s { SYMB(s) } + | eof { EOF } fuzlog/lexer.mll @@ -7,11 +7,16 @@ open Ast %token IS %token AND %token SEP +%token DEF +%token OPENB CLOSEB +%token OPENSB CLOSESB %token EOF %token <string> SYMB +%token <string> NUMBER -%start rules +%start rules vocabulary %type <Ast.rule_t list> rules +%type <Ast.def_t list> vocabulary %% @@ -43,9 +48,68 @@ is: { Is($1, $3) } ; +vocabulary: + vocabulary_ + { List.rev $1 } +; + +vocabulary_: + def + { [ $1 ] } + | vocabulary_ def + { $2 :: $1 } +; + +def: + DEF symb vocfun numbers + { DefByFun($2, $3, $4) } + | DEF symb OPENSB points CLOSESB + { DefByPoints($2, $4) } +; + +vocfun: + symb + { $1 } +; + +points: + points_ + { List.rev $1 } +; + +points_: + point + { [ $1 ] } + | points_ point + { $2 :: $1 } +; + +point: + OPENB number number CLOSEB + { ($2, $3) } +; + +numbers: + numbers_ + { List.rev $1 } +; + +numbers_: + number + { [ $1 ] } + | numbers_ number + { $2 :: $1 } +; + +number: + NUMBER + { float_of_string $1 } +; + symb: SYMB { Symb $1 } ; + %% fuzlog/parser.mly @@ -2,6 +2,25 @@ open Fuzlog open Inference open Ast +let _ = Tests.register "Build AST for vocabulary" (fun () -> + let nodes = Builder.voc_ast_from_string " + DEF BIG TRIANGLE 5.0 15.0 + DEF SMURGL [ (1 0.1) (2 0.4) ] + " in + ignore(OUnit.assert_equal 2 (List.length nodes)); + let result = match nodes with + | + (DefByFun(Symb "BIG", Symb "TRIANGLE", [5.0; 15.0;])) + :: + (DefByPoints(Symb "SMURGL", [(1.0, 0.1); (2.0, 0.4);])) + :: + [] + -> true + | _ -> false + in + OUnit.assert_bool "Not expected AST for vocabulary" result +) + let _ = Tests.register "Build AST for rules" (fun () -> let nodes = Builder.rule_ast_from_string " IF in10 IS big THEN ou10 IS fast test/builderTest.ml cacb060455e134b7245a593f838cd4a5ee58aa57 Ludovic Coquelle lcoquelle@gmail.com http://github.com/khigia/ocaml-fuzlog/commit/3d1d4baea69438d9a9434078da0d2bd74067a9dd 3d1d4baea69438d9a9434078da0d2bd74067a9dd 2008-04-10T03:33:50-07:00 2008-04-10T03:33:50-07:00 added parser rule and AST for vocabulary definition. 49bba57895254fe1d01d98dda3ae9b11ea9650bf Ludovic Coquelle lcoquelle@gmail.com