@@ -3,25 +3,10 @@ open Inference open Builder let vocabulary = - (* define few liguistic variables and register them *) - let voc = Vocabulary.create () in - let _ = Vocabulary.set - voc - "BIG" - (FuzzySet.create_triangle 5.0 15.0) - in - let _ = Vocabulary.set - voc - "FAST" - (FuzzySet.create_triangle 90.0 110.0) - in - voc - (* TODO complete the parser for vocabulary - Builder.vocabulary_from_string " + Builder.voc_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 @@ -37,7 +37,29 @@ let rules_from_string voc s = List.map (to_rule voc) (rule_ast_from_string s) +let _ = Vocabulary.register_creator + "TRIANGLE" + (fun l -> match l with + | i1::i2::[] -> FuzzySet.create_triangle i1 i2 + | _ -> failwith "creator TRIANGLE expect 2 float arguments" + ) + + +let to_var voc t = match t with + | DefByFun (Symb s, Symb def, nums) -> + let c = Vocabulary.find_creator def in + Vocabulary.set voc s (c nums) + | DefByPoints (Symb s, points) -> + Vocabulary.set voc s (FuzzySet.create points) + let voc_ast_from_string s = let lexbuf = Lexing.from_string s in Parser.vocabulary Lexer.voc_tokens lexbuf +let voc_from_string s = + let voc = Vocabulary.create () in + List.iter + (to_var voc) + (voc_ast_from_string s) + ; voc + fuzlog/builder.ml @@ -81,6 +81,15 @@ end (* module Var *) module Vocabulary = struct + let creators = Hashtbl.create 5 + + let register_creator (name:string) (creator:(float list -> FuzzySet.t)) = + Hashtbl.replace creators name creator + + let find_creator name = + Hashtbl.find creators name + + type t = { vars: (string, Var.t) Hashtbl.t; } @@ -96,6 +105,9 @@ module Vocabulary = struct let var = Var.create symb value in Hashtbl.replace voc.vars symb var + let length voc = + Hashtbl.length voc.vars + end (* module Vocabulary *) fuzlog/inference.ml @@ -21,6 +21,14 @@ let _ = Tests.register "Build AST for vocabulary" (fun () -> OUnit.assert_bool "Not expected AST for vocabulary" result ) +let _ = Tests.register "Build voc" (fun () -> + let voc = Builder.voc_from_string " + DEF BIG TRIANGLE 5.0 15.0 + DEF SMURGL [ (1 0.1) (2 0.4) ] + " in + OUnit.assert_equal 2 (Vocabulary.length voc) +) + 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 3d1d4baea69438d9a9434078da0d2bd74067a9dd Ludovic Coquelle lcoquelle@gmail.com http://github.com/khigia/ocaml-fuzlog/commit/cf8effd33eb21ef62ed770c03a6f236ba0ee49ef cf8effd33eb21ef62ed770c03a6f236ba0ee49ef 2008-04-10T06:21:55-07:00 2008-04-10T06:21:55-07:00 Basic grammar to define vocabulary (named fuzzy set). d8dd4fdfff4e31488f6836b1fe4e24d4e5254ee2 Ludovic Coquelle lcoquelle@gmail.com